summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2014-10-23 16:23:40 -0700
committerJhon Honce <jhonce@redhat.com>2014-10-23 16:23:40 -0700
commit0ac261c806c49e0987ca73261075518af27f5453 (patch)
tree58978179e6d89d5662f4b2fbe863f48297864d88 /roles/openshift_master
parente7fc0e8536bc31fc52875274dd62fb2d978aa409 (diff)
downloadopenshift-0ac261c806c49e0987ca73261075518af27f5453.tar.gz
openshift-0ac261c806c49e0987ca73261075518af27f5453.tar.bz2
openshift-0ac261c806c49e0987ca73261075518af27f5453.tar.xz
openshift-0ac261c806c49e0987ca73261075518af27f5453.zip
Support latest origin v3 CLI options
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/tasks/main.yml9
1 files changed, 6 insertions, 3 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 83573cb27..4757dc9e7 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -3,14 +3,17 @@
- name: Install Origin
yum: pkg=origin state=installed
-- name: Configure Origin settings
+- name: Set hostname to IP Addr
+ command: /usr/bin/hostname {{ oo_bind_ip }}
+
+- name: Configure OpenShift Master settings
lineinfile: >
dest=/etc/sysconfig/openshift
regexp={{ item.regex }}
line="{{ item.line }}"
with_items:
- - { regex: '^OPENSHIFT_MASTER', line: 'OPENSHIFT_MASTER=\"{{ oo_bind_ip }}\"' }
- - { regex: '^OPENSHIFT_BIND_ADDR', line: 'OPENSHIFT_BIND_ADDR=\"{{ oo_bind_ip }}\"'}
+ - { regex: '^ROLE=', line: 'ROLE=\"master\"' }
+ - { regex: '^OPTIONS=', line: 'OPTIONS=\"--nodes={{ oo_minion_ips | join(",") }} --loglevel=5\"' }
notify:
- restart openshift-master