summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorewolinetz <ewolinet@redhat.com>2017-06-23 17:23:05 -0500
committerewolinetz <ewolinet@redhat.com>2017-06-23 17:24:35 -0500
commitc299b9f199cedadf4a102ea9aaa4e33e9de6b301 (patch)
tree86bacda53187763cf05e28fa71b289fa709f9f01
parent3d19aa3e7d49cfcc19b8e3d4f997cc1ef5b83767 (diff)
downloadopenshift-c299b9f199cedadf4a102ea9aaa4e33e9de6b301.tar.gz
openshift-c299b9f199cedadf4a102ea9aaa4e33e9de6b301.tar.bz2
openshift-c299b9f199cedadf4a102ea9aaa4e33e9de6b301.tar.xz
openshift-c299b9f199cedadf4a102ea9aaa4e33e9de6b301.zip
Picking change from sdodson
-rw-r--r--roles/ansible_service_broker/tasks/install.yml4
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py1
2 files changed, 3 insertions, 2 deletions
diff --git a/roles/ansible_service_broker/tasks/install.yml b/roles/ansible_service_broker/tasks/install.yml
index e383c94da..b48583fd4 100644
--- a/roles/ansible_service_broker/tasks/install.yml
+++ b/roles/ansible_service_broker/tasks/install.yml
@@ -146,8 +146,8 @@
args:
- /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"
+ - --listen-client-urls="http://0.0.0.0:2379"
+ - --advertise-client-urls="http://0.0.0.0:2379"
ports:
- containerPort: 2379
protocol: TCP
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 8acb166d6..663423061 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -536,6 +536,7 @@ def set_node_schedulability(facts):
facts['node']['schedulable'] = True
return facts
+
# pylint: disable=too-many-branches
def set_selectors(facts):
""" Set selectors facts if not already present in facts dict