From 1328328522f11db02d526f72df66c424f3dfbfa3 Mon Sep 17 00:00:00 2001
From: "Jose A. Rivera" <jarrpa@redhat.com>
Date: Mon, 17 Apr 2017 17:36:19 -0500
Subject: GlusterFS: Allow for a separate registry-specific playbook
Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
---
playbooks/common/openshift-cluster/evaluate_groups.yml | 2 +-
playbooks/common/openshift-glusterfs/config.yml | 4 +++-
playbooks/common/openshift-glusterfs/registry.yml | 4 ++++
3 files changed, 8 insertions(+), 2 deletions(-)
create mode 100644 playbooks/common/openshift-glusterfs/registry.yml
(limited to 'playbooks/common')
diff --git a/playbooks/common/openshift-cluster/evaluate_groups.yml b/playbooks/common/openshift-cluster/evaluate_groups.yml
index 17a177644..46932b27f 100644
--- a/playbooks/common/openshift-cluster/evaluate_groups.yml
+++ b/playbooks/common/openshift-cluster/evaluate_groups.yml
@@ -155,5 +155,5 @@
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([]) }}"
+ with_items: "{{ g_glusterfs_hosts | union(g_glusterfs_registry_hosts) | default([]) }}"
changed_when: no
diff --git a/playbooks/common/openshift-glusterfs/config.yml b/playbooks/common/openshift-glusterfs/config.yml
index 75faf5ba8..1efdfb336 100644
--- a/playbooks/common/openshift-glusterfs/config.yml
+++ b/playbooks/common/openshift-glusterfs/config.yml
@@ -12,7 +12,9 @@
- service: glusterfs_bricks
port: "49152-49251/tcp"
roles:
- - os_firewall
+ - role: os_firewall
+ when:
+ - openshift_storage_glusterfs_is_native | default(True)
- name: Configure GlusterFS
hosts: oo_first_master
diff --git a/playbooks/common/openshift-glusterfs/registry.yml b/playbooks/common/openshift-glusterfs/registry.yml
new file mode 100644
index 000000000..caae79f0f
--- /dev/null
+++ b/playbooks/common/openshift-glusterfs/registry.yml
@@ -0,0 +1,4 @@
+---
+- include: config.yml
+
+- include: ../openshift-cluster/openshift_hosted.yml
--
cgit v1.2.3