Allow changing etcd image and path to support downstream (#74)

fusor · Jun 16, 2017 · eee4353 · eee4353
1 parent e0ec706
commit eee4353
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
@@ -120,6 +120,7 @@ broker_image: "{{ broker_image_name }}:{{ broker_tag }}"
 etcd_tag: "latest"
 etcd_image_name: "quay.io/coreos/etcd"
 etcd_image: "{{ etcd_image_name }}:{{ etcd_tag }}"
+etcd_path: "/usr/local/bin/etcd"
 
 # Location where we will store the local template, note this will always attempt to fetch and overwrite from 'asb_template_url'
 # If you want to modify the template, modify 'asb_template_url'

diff --git a/ansible/roles/ansible_service_broker_setup/tasks/main.yml b/ansible/roles/ansible_service_broker_setup/tasks/main.yml
@@ -31,6 +31,7 @@
       -n {{ asb_project }}
       -p BROKER_IMAGE={{ broker_image }}
       -p ETCD_IMAGE={{ etcd_image }}
+      -p ETCD_PATH={{ etcd_path }}
       -p REGISTRY_TYPE={{ broker_registry_type }}
       -p REGISTRY_URL={{ broker_registry_url }}
       -p DEV_BROKER={{ broker_dev_broker }}

diff --git a/ansible/roles/service_catalog_setup/templates/service-catalog.templ.yaml.j2 b/ansible/roles/service_catalog_setup/templates/service-catalog.templ.yaml.j2
@@ -60,7 +60,7 @@ objects:
         - env:
           - name: ETCD_DATA_DIR
             value: /data-dir
-          image: quay.io/coreos/etcd:latest
+          image: {{ etcd_image }}
           imagePullPolicy: Always
           name: etcd
           resources: {}