diff options
| author | Jhon Honce <jhonce@redhat.com> | 2015-02-17 10:43:19 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2015-02-17 10:43:19 -0700 |
| commit | bcb257a6a68cf907afeb547e34d456f0351b45c2 (patch) | |
| tree | a3a44c587779312aef8f0b28cb847a84b1f03b92 /roles/openshift_master | |
| parent | 9fed3621012fa21e87e46c704904895bf26cfa1f (diff) | |
| parent | aa6c548d4bae31526e22116967d730f6ecb528c0 (diff) | |
| download | openshift-bcb257a6a68cf907afeb547e34d456f0351b45c2.tar.gz openshift-bcb257a6a68cf907afeb547e34d456f0351b45c2.tar.bz2 openshift-bcb257a6a68cf907afeb547e34d456f0351b45c2.tar.xz openshift-bcb257a6a68cf907afeb547e34d456f0351b45c2.zip | |
Merge pull request #61 from jwhonce/wip/kubeconfig
Update playbooks for latest origin code
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/handlers/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/roles/openshift_master/handlers/main.yml b/roles/openshift_master/handlers/main.yml index 216af5dc9..5c30dccab 100644 --- a/roles/openshift_master/handlers/main.yml +++ b/roles/openshift_master/handlers/main.yml @@ -1,4 +1,4 @@ --- # handlers file for openshift_master - name: restart openshift-master - service: name=openshift state=restarted + service: name=openshift-master state=restarted 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 |