summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/tasks/main.yml
diff options
context:
space:
mode:
authorTroy Dawson <tdawson@redhat.com>2015-02-17 14:04:02 -0600
committerTroy Dawson <tdawson@redhat.com>2015-02-17 14:04:02 -0600
commit208af8ffec722622ab6dff428154ac3b00ca1434 (patch)
treeb9c5153beaa6563e9cd9a09e0eec97ea73287764 /roles/openshift_master/tasks/main.yml
parent5825d847da539256de3a7e4eef2dcbc38c198d0a (diff)
parentbcb257a6a68cf907afeb547e34d456f0351b45c2 (diff)
downloadopenshift-208af8ffec722622ab6dff428154ac3b00ca1434.tar.gz
openshift-208af8ffec722622ab6dff428154ac3b00ca1434.tar.bz2
openshift-208af8ffec722622ab6dff428154ac3b00ca1434.tar.xz
openshift-208af8ffec722622ab6dff428154ac3b00ca1434.zip
fixup oso-rhui repos
Diffstat (limited to 'roles/openshift_master/tasks/main.yml')
-rw-r--r--roles/openshift_master/tasks/main.yml11
1 files changed, 5 insertions, 6 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 6826ef452..9f28a3469 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -1,20 +1,19 @@
---
# tasks file for openshift_master
- name: Install Origin
- yum: pkg=origin state=installed
+ yum: pkg=openshift-master state=installed
- # fixme: Once openshift stops resolving hostnames for minion queries remove this...
+ # fixme: Once openshift stops resolving hostnames for node queries remove this...
- name: Set hostname to IP Addr (WORKAROUND)
command: /usr/bin/hostname {{ oo_bind_ip }}
- name: Configure OpenShift Master settings
lineinfile:
- dest: /etc/sysconfig/openshift
+ dest: /etc/sysconfig/openshift-master
regexp: "{{ item.regex }}"
line: "{{ item.line }}"
with_items:
- - { regex: '^ROLE=', line: 'ROLE=\"master\"' }
- - { regex: '^OPTIONS=', line: 'OPTIONS=\"--nodes={{ oo_minion_ips | join(",") }} --loglevel=5\"' }
+ - { regex: '^OPTIONS=', line: 'OPTIONS=\"--public-master={{ oo_public_ip }} --nodes={{ oo_node_ips | join(",") }} --loglevel=5\"' }
notify:
- restart openshift-master
@@ -31,4 +30,4 @@
firewalld: port=8080/tcp permanent=true state=enabled
- name: Enable OpenShift
- service: name=openshift enabled=yes state=started
+ service: name=openshift-master enabled=yes state=started