diff options
-rw-r--r-- | roles/openshift_common/tasks/main.yml | 12 | ||||
-rw-r--r-- | roles/openshift_master/tasks/main.yml | 27 | ||||
-rw-r--r-- | roles/openshift_node/tasks/main.yml | 12 |
3 files changed, 37 insertions, 14 deletions
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index f72beb65b..b94fca690 100644 --- a/roles/openshift_common/tasks/main.yml +++ b/roles/openshift_common/tasks/main.yml @@ -10,9 +10,15 @@ - name: Set common OpenShift facts include: set_facts.yml facts: - - { section: common, option: env, value: "{{ openshift_env | default('default') }}" } - - { section: common, option: host_type, value: "{{ openshift_host_type }}" } - - { section: common, option: debug_level, value: "{{ openshift_debug_level }}" } + - section: common + option: env + value: "{{ openshift_env | default('default') }}" + - section: common + option: host_type + value: "{{ openshift_host_type }}" + - section: common + option: debug_level + value: "{{ openshift_debug_level }}" - name: Add KUBECONFIG to .bash_profile for user root lineinfile: diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index ef915d63b..eb8c6a2bd 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -5,12 +5,17 @@ - name: Configure firewall for OpenShift Master include: "{{ role_path | dirname }}/openshift_common/tasks/firewall.yml" allow: - - { service: etcd embedded, port: 4001/tcp} - - { service: etcd peer, port: 7001/tcp} - - { service: OpenShift api https, port: 8443/tcp} - - { service: OpenShift web console https, port: 8444/tcp} + - service: etcd embedded + port: 4001/tcp + - service: etcd peer + port: 7001/tcp + - service: OpenShift api https + port: 8443/tcp + - service: OpenShift web console https + port: 8444/tcp deny: - - { service: OpenShift api http, port: 8080/tcp } + - service: OpenShift api http + port: 8080/tcp - name: Configure OpenShift settings lineinfile: @@ -33,9 +38,15 @@ - name: Set master OpenShift facts include: "{{ role_path | dirname }}/openshift_common/tasks/set_facts.yml" facts: - - { section: master, option: debug_level, value: "{{ openshift_master_debug_level }}" } - - { section: master, option: public_ip, value: "{{ openshift_public_ip }}" } - - { section: master, option: externally_managed, value: "{{ openshift_master_manage_service_externally }}" } + - section: master + option: debug_level + value: "{{ openshift_master_debug_level }}" } + - section: master + option: public_ip + value: "{{ openshift_public_ip }}" } + - section: master + option: externally_managed + value: "{{ openshift_master_manage_service_externally }}" } - name: Start and enable openshift-master service: name=openshift-master enabled=yes state=started diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index e458f651b..de010bd0c 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -42,9 +42,15 @@ - name: Set OpenShift node facts include: "{{ role_path | dirname }}/openshift_common/tasks/set_facts.yml" facts: - - { section: node, option: debug_level, value: "{{ openshift_node_debug_level }}" } - - { section: node, option: public_ip, value: "{{ openshift_public_ip }}" } - - { section: node, option: externally_managed, value: "{{ openshift_node_manage_service_externally }}" } + - section: node + option: debug_level + value: "{{ openshift_node_debug_level }}" + - section: node + option: public_ip + value: "{{ openshift_public_ip }}" + - section: node + option: externally_managed + value: "{{ openshift_node_manage_service_externally }}" # fixme: Once the openshift_cluster playbook is published state should be started # Always bounce service to pick up new credentials |