summaryrefslogtreecommitdiffstats
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
parente7fc0e8536bc31fc52875274dd62fb2d978aa409 (diff)
downloadopenshift-0ac261c806c49e0987ca73261075518af27f5453.tar.gz
openshift-0ac261c806c49e0987ca73261075518af27f5453.tar.bz2
openshift-0ac261c806c49e0987ca73261075518af27f5453.tar.xz
openshift-0ac261c806c49e0987ca73261075518af27f5453.zip
Support latest origin v3 CLI options
-rwxr-xr-xcluster.sh6
-rw-r--r--roles/openshift_master/tasks/main.yml9
-rw-r--r--roles/openshift_minion/tasks/main.yml14
3 files changed, 14 insertions, 15 deletions
diff --git a/cluster.sh b/cluster.sh
index 4a7a0b543..b44bff01e 100755
--- a/cluster.sh
+++ b/cluster.sh
@@ -1,13 +1,11 @@
#!/bin/bash -eu
-MINIONS=1
+MINIONS=3
MASTERS=1
PROVIDER=gce
-# FIXME: Add option
-#MASTER_PLAYBOOK=os3-master
+# FIXME: Add options
MASTER_PLAYBOOK=openshift-master
-#MINION_PLAYBOOK=os3-minion
MINION_PLAYBOOK=openshift-minion
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
diff --git a/roles/openshift_minion/tasks/main.yml b/roles/openshift_minion/tasks/main.yml
index 2b1f5332e..7a79b4ee9 100644
--- a/roles/openshift_minion/tasks/main.yml
+++ b/roles/openshift_minion/tasks/main.yml
@@ -3,14 +3,17 @@
- name: Install OpenShift
yum: pkg=origin state=installed
-- name: Configure OpenShift settings
+- name: Set hostname to IP Addr
+ command: /usr/bin/hostname {{ oo_bind_ip }}
+
+- name: Configure OpenShift Minion settings
lineinfile: >
dest=/etc/sysconfig/openshift
regexp={{ item.regex }}
line="{{ item.line }}"
with_items:
- - { regex: '^OPENSHIFT_MASTER', line: 'OPENSHIFT_MASTER=\"{{ oo_master_ips[0] }}\"' }
- - { regex: '^OPENSHIFT_BIND_ADDR', line: 'OPENSHIFT_BIND_ADDR=\"{{ oo_bind_ip }}\"'}
+ - { regex: '^ROLE=', line: 'ROLE=\"node\"' }
+ - { regex: '^OPTIONS=', line: 'OPTIONS=\"--master=http://{{ oo_master_ips[0] }}:8080 --loglevel=5\"' }
notify:
- restart openshift-minion
@@ -20,11 +23,6 @@
- name: Save firewalld port for OpenShift
firewalld: port=10250/tcp permanent=true state=enabled
- # POST ${master_ip}:8080/api/v1beta1/minions kind=Minion id=${node_ip} apiVersion=v1beta1 hostIP=${node_ip} >/dev/null
-
- name: Enable OpenShift
service: name=openshift enabled=yes state=started
-- name: Register with OpenShift master
- command: "curl -X POST -H 'Accept: application/json' -d '{\"kind\":\"Minion\", \"id\":\"{{ oo_bind_ip }}\", \"apiVersion\":\"v1beta1\", \"hostIP\":\"{{ oo_bind_ip }}\" }' http://{{ oo_master_ips[0] }}:8080/api/v1beta1/minions"
- when: oo_master_ips[0] != ''