From 98815e010d29c670ff15aecf5dd15fb1241c76f0 Mon Sep 17 00:00:00 2001 From: Russell Teague Date: Thu, 16 Nov 2017 13:32:31 -0500 Subject: Playbook Consolidation - openshift-nfs --- playbooks/aws/openshift-cluster/install.yml | 2 +- playbooks/byo/openshift-nfs/config.yml | 4 --- playbooks/common/openshift-cluster/config.yml | 2 +- playbooks/common/openshift-nfs/config.yml | 30 ---------------------- playbooks/common/openshift-nfs/filter_plugins | 1 - playbooks/common/openshift-nfs/lookup_plugins | 1 - playbooks/common/openshift-nfs/roles | 1 - playbooks/openshift-nfs/config.yml | 4 +++ playbooks/openshift-nfs/private/config.yml | 30 ++++++++++++++++++++++ playbooks/openshift-nfs/private/filter_plugins | 1 + playbooks/openshift-nfs/private/lookup_plugins | 1 + playbooks/openshift-nfs/private/roles | 1 + roles/installer_checkpoint/README.md | 2 +- .../callback_plugins/installer_checkpoint.py | 2 +- 14 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 playbooks/byo/openshift-nfs/config.yml delete mode 100644 playbooks/common/openshift-nfs/config.yml delete mode 120000 playbooks/common/openshift-nfs/filter_plugins delete mode 120000 playbooks/common/openshift-nfs/lookup_plugins delete mode 120000 playbooks/common/openshift-nfs/roles create mode 100644 playbooks/openshift-nfs/config.yml create mode 100644 playbooks/openshift-nfs/private/config.yml create mode 120000 playbooks/openshift-nfs/private/filter_plugins create mode 120000 playbooks/openshift-nfs/private/lookup_plugins create mode 120000 playbooks/openshift-nfs/private/roles diff --git a/playbooks/aws/openshift-cluster/install.yml b/playbooks/aws/openshift-cluster/install.yml index 8756fb52a..a6b278fdf 100644 --- a/playbooks/aws/openshift-cluster/install.yml +++ b/playbooks/aws/openshift-cluster/install.yml @@ -25,7 +25,7 @@ include: ../../common/openshift-etcd/config.yml - name: include nfs - include: ../../common/openshift-nfs/config.yml + include: ../../openshift-nfs/private/config.yml when: groups.oo_nfs_to_config | default([]) | count > 0 - name: include loadbalancer diff --git a/playbooks/byo/openshift-nfs/config.yml b/playbooks/byo/openshift-nfs/config.yml deleted file mode 100644 index a5e6fe784..000000000 --- a/playbooks/byo/openshift-nfs/config.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- include: ../../init/main.yml - -- include: ../../common/openshift-nfs/config.yml diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 3b4d6f9a6..d00273ef6 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -3,7 +3,7 @@ - include: ../openshift-etcd/config.yml -- include: ../openshift-nfs/config.yml +- include: ../../openshift-nfs/private/config.yml when: groups.oo_nfs_to_config | default([]) | count > 0 - include: ../openshift-loadbalancer/config.yml diff --git a/playbooks/common/openshift-nfs/config.yml b/playbooks/common/openshift-nfs/config.yml deleted file mode 100644 index 6ea77e00b..000000000 --- a/playbooks/common/openshift-nfs/config.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -- name: NFS Install Checkpoint Start - hosts: all - gather_facts: false - tasks: - - name: Set NFS install 'In Progress' - run_once: true - set_stats: - data: - installer_phase_nfs: - status: "In Progress" - start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}" - -- name: Configure nfs - hosts: oo_nfs_to_config - roles: - - role: os_firewall - - role: openshift_storage_nfs - -- name: NFS Install Checkpoint End - hosts: all - gather_facts: false - tasks: - - name: Set NFS install 'Complete' - run_once: true - set_stats: - data: - installer_phase_nfs: - status: "Complete" - end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}" diff --git a/playbooks/common/openshift-nfs/filter_plugins b/playbooks/common/openshift-nfs/filter_plugins deleted file mode 120000 index 99a95e4ca..000000000 --- a/playbooks/common/openshift-nfs/filter_plugins +++ /dev/null @@ -1 +0,0 @@ -../../../filter_plugins \ No newline at end of file diff --git a/playbooks/common/openshift-nfs/lookup_plugins b/playbooks/common/openshift-nfs/lookup_plugins deleted file mode 120000 index ac79701db..000000000 --- a/playbooks/common/openshift-nfs/lookup_plugins +++ /dev/null @@ -1 +0,0 @@ -../../../lookup_plugins \ No newline at end of file diff --git a/playbooks/common/openshift-nfs/roles b/playbooks/common/openshift-nfs/roles deleted file mode 120000 index e2b799b9d..000000000 --- a/playbooks/common/openshift-nfs/roles +++ /dev/null @@ -1 +0,0 @@ -../../../roles/ \ No newline at end of file diff --git a/playbooks/openshift-nfs/config.yml b/playbooks/openshift-nfs/config.yml new file mode 100644 index 000000000..8ee57ce8d --- /dev/null +++ b/playbooks/openshift-nfs/config.yml @@ -0,0 +1,4 @@ +--- +- include: ../init/main.yml + +- include: private/config.yml diff --git a/playbooks/openshift-nfs/private/config.yml b/playbooks/openshift-nfs/private/config.yml new file mode 100644 index 000000000..6ea77e00b --- /dev/null +++ b/playbooks/openshift-nfs/private/config.yml @@ -0,0 +1,30 @@ +--- +- name: NFS Install Checkpoint Start + hosts: all + gather_facts: false + tasks: + - name: Set NFS install 'In Progress' + run_once: true + set_stats: + data: + installer_phase_nfs: + status: "In Progress" + start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}" + +- name: Configure nfs + hosts: oo_nfs_to_config + roles: + - role: os_firewall + - role: openshift_storage_nfs + +- name: NFS Install Checkpoint End + hosts: all + gather_facts: false + tasks: + - name: Set NFS install 'Complete' + run_once: true + set_stats: + data: + installer_phase_nfs: + status: "Complete" + end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}" diff --git a/playbooks/openshift-nfs/private/filter_plugins b/playbooks/openshift-nfs/private/filter_plugins new file mode 120000 index 000000000..99a95e4ca --- /dev/null +++ b/playbooks/openshift-nfs/private/filter_plugins @@ -0,0 +1 @@ +../../../filter_plugins \ No newline at end of file diff --git a/playbooks/openshift-nfs/private/lookup_plugins b/playbooks/openshift-nfs/private/lookup_plugins new file mode 120000 index 000000000..ac79701db --- /dev/null +++ b/playbooks/openshift-nfs/private/lookup_plugins @@ -0,0 +1 @@ +../../../lookup_plugins \ No newline at end of file diff --git a/playbooks/openshift-nfs/private/roles b/playbooks/openshift-nfs/private/roles new file mode 120000 index 000000000..e2b799b9d --- /dev/null +++ b/playbooks/openshift-nfs/private/roles @@ -0,0 +1 @@ +../../../roles/ \ No newline at end of file diff --git a/roles/installer_checkpoint/README.md b/roles/installer_checkpoint/README.md index f8588c4bf..b1b4441f5 100644 --- a/roles/installer_checkpoint/README.md +++ b/roles/installer_checkpoint/README.md @@ -68,7 +68,7 @@ phase are stored in the `phase_attributes` variable. }, 'installer_phase_nfs': { 'title': 'NFS Install', - 'playbook': 'playbooks/byo/openshift-nfs/config.yml' + 'playbook': 'playbooks/openshift-nfs/config.yml' }, #... } diff --git a/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py b/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py index 556e9127f..723e43e8d 100644 --- a/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py +++ b/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py @@ -54,7 +54,7 @@ class CallbackModule(CallbackBase): }, 'installer_phase_nfs': { 'title': 'NFS Install', - 'playbook': 'playbooks/byo/openshift-nfs/config.yml' + 'playbook': 'playbooks/openshift-nfs/config.yml' }, 'installer_phase_loadbalancer': { 'title': 'Load balancer Install', -- cgit v1.2.3