From 0ac261c806c49e0987ca73261075518af27f5453 Mon Sep 17 00:00:00 2001
From: Jhon Honce <jhonce@redhat.com>
Date: Thu, 23 Oct 2014 16:23:40 -0700
Subject: Support latest origin v3 CLI options

---
 roles/openshift_master/tasks/main.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'roles/openshift_master')

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
 
-- 
cgit v1.2.3