diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-04-17 16:30:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-17 16:30:53 -0500 |
| commit | c5f7ac0c93c3e2138dfaa57a4a58bbd6afb9eb57 (patch) | |
| tree | 1e9f1a81b7b76f02bb095ffef0f58934e79fa011 /playbooks/common/openshift-cluster | |
| parent | cf06e28ac23d13e9fe6e48fe66d033d6ebaaa263 (diff) | |
| parent | 84f65590e8acebdc0f4be35dd6ab41ec5627420b (diff) | |
| download | openshift-c5f7ac0c93c3e2138dfaa57a4a58bbd6afb9eb57.tar.gz openshift-c5f7ac0c93c3e2138dfaa57a4a58bbd6afb9eb57.tar.bz2 openshift-c5f7ac0c93c3e2138dfaa57a4a58bbd6afb9eb57.tar.xz openshift-c5f7ac0c93c3e2138dfaa57a4a58bbd6afb9eb57.zip | |
Merge pull request #3793 from jarrpa/glusterfs-registry
Merged by openshift-bot
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/evaluate_groups.yml | 13 |
2 files changed, 17 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 3c70db6a9..239bb211b 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -31,6 +31,10 @@ tags: - node +- include: ../openshift-glusterfs/config.yml + tags: + - glusterfs + - include: openshift_hosted.yml tags: - hosted diff --git a/playbooks/common/openshift-cluster/evaluate_groups.yml b/playbooks/common/openshift-cluster/evaluate_groups.yml index 45a4875a3..6aac70f63 100644 --- a/playbooks/common/openshift-cluster/evaluate_groups.yml +++ b/playbooks/common/openshift-cluster/evaluate_groups.yml @@ -29,6 +29,10 @@ msg: The nfs group must be limited to one host when: "{{ (groups[g_nfs_hosts] | default([])) | length > 1 }}" + - fail: + msg: This playbook requires g_glusterfs_hosts to be set + when: "{{ g_glusterfs_hosts is not defined }}" + - name: Evaluate oo_all_hosts add_host: name: "{{ item }}" @@ -119,3 +123,12 @@ ansible_become: "{{ g_sudo | default(omit) }}" with_items: "{{ g_nfs_hosts | default([]) }}" changed_when: no + + - name: Evaluate oo_glusterfs_to_config + add_host: + name: "{{ item }}" + groups: oo_glusterfs_to_config + ansible_ssh_user: "{{ g_ssh_user | default(omit) }}" + ansible_become: "{{ g_sudo | default(omit) }}" + with_items: "{{ g_glusterfs_hosts | default([]) }}" + changed_when: no |