summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-06-28 15:27:20 -0400
committerGitHub <noreply@github.com>2017-06-28 15:27:20 -0400
commit03179d8c93e743578f13c5f15cb3ec8a2a44270f (patch)
tree40f80f71f012218cf99d9251616fa950c833548c
parent9613d2e517ced0bc5d165801df3442ab331d214c (diff)
parent55a070ebc70b8cfaa9a45f35780439b14d6fbc9f (diff)
downloadopenshift-03179d8c93e743578f13c5f15cb3ec8a2a44270f.tar.gz
openshift-03179d8c93e743578f13c5f15cb3ec8a2a44270f.tar.bz2
openshift-03179d8c93e743578f13c5f15cb3ec8a2a44270f.tar.xz
openshift-03179d8c93e743578f13c5f15cb3ec8a2a44270f.zip
Merge pull request #4634 from fabianvf/asb-etcd-path-parameter
Parameterize etcd binary path for ansible service broker
-rw-r--r--roles/ansible_service_broker/tasks/install.yml3
-rw-r--r--roles/ansible_service_broker/vars/default_images.yml1
-rw-r--r--roles/ansible_service_broker/vars/openshift-enterprise.yml1
3 files changed, 4 insertions, 1 deletions
diff --git a/roles/ansible_service_broker/tasks/install.yml b/roles/ansible_service_broker/tasks/install.yml
index e383c94da..81c3f8e5b 100644
--- a/roles/ansible_service_broker/tasks/install.yml
+++ b/roles/ansible_service_broker/tasks/install.yml
@@ -14,6 +14,7 @@
ansible_service_broker_etcd_image_prefix: "{{ ansible_service_broker_etcd_image_prefix | default(__ansible_service_broker_etcd_image_prefix) }}"
ansible_service_broker_etcd_image_tag: "{{ ansible_service_broker_etcd_image_tag | default(__ansible_service_broker_etcd_image_tag) }}"
+ ansible_service_broker_etcd_image_etcd_path: "{{ ansible_service_broker_etcd_image_etcd_path | default(__ansible_service_broker_etcd_image_etcd_path) }}"
ansible_service_broker_registry_type: "{{ ansible_service_broker_registry_type | default(__ansible_service_broker_registry_type) }}"
ansible_service_broker_registry_url: "{{ ansible_service_broker_registry_url | default(__ansible_service_broker_registry_url) }}"
@@ -144,7 +145,7 @@
terminationMessagePath: /tmp/termination-log
workingDir: /etcd
args:
- - /usr/local/bin/etcd
+ - '{{ ansible_service_broker_etcd_image_etcd_path }}'
- --data-dir=/data
- "--listen-client-urls=http://0.0.0.0:2379"
- "--advertise-client-urls=http://0.0.0.0:2379"
diff --git a/roles/ansible_service_broker/vars/default_images.yml b/roles/ansible_service_broker/vars/default_images.yml
index b0b3835e3..15e448515 100644
--- a/roles/ansible_service_broker/vars/default_images.yml
+++ b/roles/ansible_service_broker/vars/default_images.yml
@@ -5,6 +5,7 @@ __ansible_service_broker_image_tag: latest
__ansible_service_broker_etcd_image_prefix: quay.io/coreos/
__ansible_service_broker_etcd_image_tag: latest
+__ansible_service_broker_etcd_image_etcd_path: /usr/local/bin/etcd
__ansible_service_broker_registry_type: dockerhub
__ansible_service_broker_registry_url: null
diff --git a/roles/ansible_service_broker/vars/openshift-enterprise.yml b/roles/ansible_service_broker/vars/openshift-enterprise.yml
index a6d999647..19b4a5147 100644
--- a/roles/ansible_service_broker/vars/openshift-enterprise.yml
+++ b/roles/ansible_service_broker/vars/openshift-enterprise.yml
@@ -5,6 +5,7 @@ __ansible_service_broker_image_tag: latest
__ansible_service_broker_etcd_image_prefix: rhel7/
__ansible_service_broker_etcd_image_tag: latest
+__ansible_service_broker_etcd_image_etcd_path: /bin/etcd
__ansible_service_broker_registry_type: rhcc
__ansible_service_broker_registry_url: "https://registry.access.redhat.com"