diff options
author | Matt Woodson <mwoodson@redhat.com> | 2015-02-24 10:16:20 -0500 |
---|---|---|
committer | Matt Woodson <mwoodson@redhat.com> | 2015-02-24 10:16:20 -0500 |
commit | 41ad58a9b9cd59eb5d8bece20d0c1073190d67b4 (patch) | |
tree | 7f11cf6a031a5c8b0efe9618c7ec3476c39fcbb8 /roles/openshift_master/tasks/main.yml | |
parent | f780d4fa01a1e8b1559d31a7065715317a884ec4 (diff) | |
parent | 0d0b7fa2bba160e8d04ba0f67a0de5c7a06499db (diff) | |
download | openshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.tar.gz openshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.tar.bz2 openshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.tar.xz openshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.zip |
Merge branch 'master' into tower_install
Conflicts:
lib/aws_command.rb
Diffstat (limited to 'roles/openshift_master/tasks/main.yml')
-rw-r--r-- | roles/openshift_master/tasks/main.yml | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 6826ef452..6f96a6cdb 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -1,34 +1,37 @@ --- # 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 -- name: Open firewalld port for etcd embedded in OpenShift - firewalld: port=4001/tcp permanent=false state=enabled +# Open etcd embedded, etcd embedded peer, openshift api, and +# openshift client ports +- name: Open firewalld ports for openshift-master + firewalld: port={{ item[0] }} permanent={{ item[1] }} state=enabled + with_nested: + - [ 4001/tcp, 7001/tcp, 8443/tcp, 8444/tcp ] + - [ true, false ] -- name: Save firewalld port for etcd embedded in - firewalld: port=4001/tcp permanent=true state=enabled - -- name: Open firewalld port for OpenShift - firewalld: port=8080/tcp permanent=false state=enabled - -- name: Save firewalld port for OpenShift - firewalld: port=8080/tcp permanent=true state=enabled +# Disable previously exposed ports that are no longer needed +- name: Close firewalld ports for openshift-master that are no longer needed + firewalld: port={{ item[0] }} permanent={{ item[1] }} state=enabled + with_nested: + - [ 8080/tcp ] + - [ true, false ] - name: Enable OpenShift - service: name=openshift enabled=yes state=started + service: name=openshift-master enabled=yes state=started |