summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-02-23 16:29:30 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2015-02-23 16:29:30 -0500
commit0d0b7fa2bba160e8d04ba0f67a0de5c7a06499db (patch)
tree72cac0d2687e089546f68103adeaea36b124a18c /roles/openshift_master
parent89528214cdaf8cad7321079f573d844db7004b71 (diff)
parentfa3122ce4edc48f1c4f4663257a5feaa69fc8c0b (diff)
downloadopenshift-0d0b7fa2bba160e8d04ba0f67a0de5c7a06499db.tar.gz
openshift-0d0b7fa2bba160e8d04ba0f67a0de5c7a06499db.tar.bz2
openshift-0d0b7fa2bba160e8d04ba0f67a0de5c7a06499db.tar.xz
openshift-0d0b7fa2bba160e8d04ba0f67a0de5c7a06499db.zip
Merge pull request #77 from twiest/conf_bug
Fixed bug that was causing cluster creates to fail. Cleaned up cruft.
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/tasks/main.yml3
-rw-r--r--roles/openshift_master/vars/main.yml2
2 files changed, 3 insertions, 2 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 96b889804..6f96a6cdb 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -13,7 +13,8 @@
regexp: "{{ item.regex }}"
line: "{{ item.line }}"
with_items:
- - { regex: '^OPTIONS=', line: "OPTIONS=\"--public-master={{ oo_public_ip }} --nodes={{ oo_node_ips | join(",") }} --loglevel=5\"" }
+ - regex: '^OPTIONS='
+ line: "OPTIONS=\"--public-master={{ oo_public_ip }} --nodes={{ oo_node_ips | join(',') }} --loglevel=5\""
notify:
- restart openshift-master
diff --git a/roles/openshift_master/vars/main.yml b/roles/openshift_master/vars/main.yml
index 1f5cb46d6..e5e5535e7 100644
--- a/roles/openshift_master/vars/main.yml
+++ b/roles/openshift_master/vars/main.yml
@@ -1,2 +1,2 @@
---
-# vars file for kubernetes_apiserver
+# vars file for openshift_master