diff options
Diffstat (limited to 'roles/ands_openshift')
| -rw-r--r-- | roles/ands_openshift/defaults/main.yml | 6 | ||||
| -rw-r--r-- | roles/ands_openshift/tasks/heketi.yml | 2 | ||||
| -rw-r--r-- | roles/ands_openshift/tasks/heketi_resources.yml | 2 | ||||
| -rw-r--r-- | roles/ands_openshift/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/ands_openshift/tasks/ssh.yml | 2 | ||||
| -rw-r--r-- | roles/ands_openshift/tasks/storage.yml | 2 | ||||
| -rw-r--r-- | roles/ands_openshift/tasks/users.yml | 2 |
7 files changed, 10 insertions, 8 deletions
diff --git a/roles/ands_openshift/defaults/main.yml b/roles/ands_openshift/defaults/main.yml index 857c389..e473b98 100644 --- a/roles/ands_openshift/defaults/main.yml +++ b/roles/ands_openshift/defaults/main.yml @@ -1,8 +1,10 @@ -openshift_all_subroles: "{{ [ 'hostnames', 'users', 'ssh', 'storage', 'heketi' ] }}" +openshift_common_subroles: "{{ [ 'hostnames', 'users', 'storage' ] }}" +openshift_heketi_subroles: "{{ [ 'ssh', 'heketi' ] }}" +openshift_all_subroles: "{{ ands_configure_heketi | default(False) | ternary(openshift_common_subroles + openshift_heketi_subroles, openshift_common_subroles) }}" + openshift_subroles: "{{ ( subrole is defined ) | ternary( [ subrole ], openshift_all_subroles ) }}" openshift_namespace: "default" -ands_disable_dynamic_provisioning: false ssh_template_path: "{{ ands_paths.provision }}/ssh/" storage_template_path: "{{ ands_paths.provision }}/gfs/" diff --git a/roles/ands_openshift/tasks/heketi.yml b/roles/ands_openshift/tasks/heketi.yml index 149f85d..7d2c4ed 100644 --- a/roles/ands_openshift/tasks/heketi.yml +++ b/roles/ands_openshift/tasks/heketi.yml @@ -5,7 +5,7 @@ with_items: - heketi-client - - include: heketi_resources.yml + - include_tasks: heketi_resources.yml run_once: true delegate_to: "{{ groups.masters[0] }}" when: ansible_lvm.lvs.{{ ands_heketi_lv }} is defined diff --git a/roles/ands_openshift/tasks/heketi_resources.yml b/roles/ands_openshift/tasks/heketi_resources.yml index 06ae6b3..4abb411 100644 --- a/roles/ands_openshift/tasks/heketi_resources.yml +++ b/roles/ands_openshift/tasks/heketi_resources.yml @@ -37,7 +37,7 @@ changed_when: (result | failed) or ((result.stdout | int) < 1) - name: Fix GlusterFS volume permissions - include: heketi_perms.yml + include_tasks: heketi_perms.yml run_once: true delegate_to: "{{ groups.masters[0] }}" when: (result | changed) diff --git a/roles/ands_openshift/tasks/main.yml b/roles/ands_openshift/tasks/main.yml index f72123f..cd62a10 100644 --- a/roles/ands_openshift/tasks/main.yml +++ b/roles/ands_openshift/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Configuring OpenShift" - include: "{{ current_subrole }}.yml" + include_tasks: "{{ current_subrole }}.yml" with_items: "{{ openshift_subroles }}" loop_control: loop_var: current_subrole diff --git a/roles/ands_openshift/tasks/ssh.yml b/roles/ands_openshift/tasks/ssh.yml index 7d8d99d..e8cb8d1 100644 --- a/roles/ands_openshift/tasks/ssh.yml +++ b/roles/ands_openshift/tasks/ssh.yml @@ -7,7 +7,7 @@ changed_when: (result | failed) failed_when: false -- include: ssh_keygen.yml +- include_tasks: ssh_keygen.yml run_once: true delegate_to: "{{ groups.masters[0] }}" when: (result | changed) diff --git a/roles/ands_openshift/tasks/storage.yml b/roles/ands_openshift/tasks/storage.yml index be2583a..66f0855 100644 --- a/roles/ands_openshift/tasks/storage.yml +++ b/roles/ands_openshift/tasks/storage.yml @@ -1,4 +1,4 @@ --- -- include: storage_resources.yml +- include_tasks: storage_resources.yml run_once: true delegate_to: "{{ groups.masters[0] }}" diff --git a/roles/ands_openshift/tasks/users.yml b/roles/ands_openshift/tasks/users.yml index c816203..a692a24 100644 --- a/roles/ands_openshift/tasks/users.yml +++ b/roles/ands_openshift/tasks/users.yml @@ -3,6 +3,6 @@ copy: src="users/htpasswd" dest="/etc/origin/master/htpasswd" mode=0644 owner=root group=root force=yes backup=no when: "'masters' in group_names" -- include: users_resources.yml +- include_tasks: users_resources.yml run_once: true delegate_to: "{{ groups.masters[0] }}" |