summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian von Feilitzsch <fabian@fabianism.us>2017-06-22 16:44:35 -0400
committerFabian von Feilitzsch <fabian@fabianism.us>2017-06-22 17:13:28 -0400
commit65922489a91c86a087daeebef48ee90ba7f16328 (patch)
tree7b114cf7a0f49df30f3e800a2b740a4298e56967
parentc53500a50797b6ff40f3fbae3bf688aa41762f69 (diff)
downloadopenshift-65922489a91c86a087daeebef48ee90ba7f16328.tar.gz
openshift-65922489a91c86a087daeebef48ee90ba7f16328.tar.bz2
openshift-65922489a91c86a087daeebef48ee90ba7f16328.tar.xz
openshift-65922489a91c86a087daeebef48ee90ba7f16328.zip
Cleanup/updates for env variables and etcd image
Fix embarrassing typo fix etcd command
-rw-r--r--roles/ansible_service_broker/tasks/install.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/roles/ansible_service_broker/tasks/install.yml b/roles/ansible_service_broker/tasks/install.yml
index 3d7023704..f626b100a 100644
--- a/roles/ansible_service_broker/tasks/install.yml
+++ b/roles/ansible_service_broker/tasks/install.yml
@@ -24,7 +24,7 @@
- name: set ansible-service-broker image facts using set prefix and tag
set_fact:
ansible_service_broker_image: "{{ ansible_service_broker_image_prefix }}ansible-service-broker:{{ ansible_service_broker_image_tag }}"
- ansible_service_broker_etcd_image: "{{ ansible_service_broker_etcd_image_prefix }}ansible-service-broker:{{ ansible_service_broker_etcd_image_tag }}"
+ ansible_service_broker_etcd_image: "{{ ansible_service_broker_etcd_image_prefix }}etcd:{{ ansible_service_broker_etcd_image_tag }}"
- include: validate_facts.yml
@@ -144,7 +144,7 @@
terminationMessagePath: /tmp/termination-log
workingDir: /etcd
args:
- - ./etcd
+ - /usr/local/bin/etcd
- --data-dir=/data
- "--listen-client-urls=http://0.0.0.0:2379"
- "--advertise-client-urls=http://0.0.0.0:2379"
@@ -201,9 +201,9 @@
ports:
- containerPort: 1338
protocol: TCP
- args:
- - -c
- - /etc/ansible-service-broker/config.yaml
+ env:
+ - name: BROKER_CONFIG
+ value: /etc/ansible-service-broker/config.yaml
terminationMessagePath: /tmp/termination-log
volumes:
- name: config-volume