diff options
author | Eric Wolinetz <ewolinet@redhat.com> | 2017-06-23 07:41:46 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-23 07:41:46 -0500 |
commit | 7c1d735ff983b9d494cdbdb4c113b1282bab6242 (patch) | |
tree | 7b114cf7a0f49df30f3e800a2b740a4298e56967 | |
parent | c53500a50797b6ff40f3fbae3bf688aa41762f69 (diff) | |
parent | 65922489a91c86a087daeebef48ee90ba7f16328 (diff) | |
download | openshift-7c1d735ff983b9d494cdbdb4c113b1282bab6242.tar.gz openshift-7c1d735ff983b9d494cdbdb4c113b1282bab6242.tar.bz2 openshift-7c1d735ff983b9d494cdbdb4c113b1282bab6242.tar.xz openshift-7c1d735ff983b9d494cdbdb4c113b1282bab6242.zip |
Merge pull request #27 from fabianvf/broker-fixes
Broker fixes
-rw-r--r-- | roles/ansible_service_broker/tasks/install.yml | 10 |
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 |