From d32ab495ae636bb381b4e325ca4f4f913947187d Mon Sep 17 00:00:00 2001 From: Russell Teague Date: Wed, 22 Nov 2017 14:28:20 -0500 Subject: Playbook Consolidation - openshift-provisioners --- playbooks/byo/openshift-cluster/openshift-provisioners.yml | 4 ---- playbooks/common/openshift-cluster/openshift_provisioners.yml | 5 ----- playbooks/openshift-provisioners/config.yml | 4 ++++ playbooks/openshift-provisioners/private/config.yml | 5 +++++ playbooks/openshift-provisioners/private/roles | 1 + 5 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 playbooks/byo/openshift-cluster/openshift-provisioners.yml delete mode 100644 playbooks/common/openshift-cluster/openshift_provisioners.yml create mode 100644 playbooks/openshift-provisioners/config.yml create mode 100644 playbooks/openshift-provisioners/private/config.yml create mode 120000 playbooks/openshift-provisioners/private/roles (limited to 'playbooks') diff --git a/playbooks/byo/openshift-cluster/openshift-provisioners.yml b/playbooks/byo/openshift-cluster/openshift-provisioners.yml deleted file mode 100644 index 0949d33c9..000000000 --- a/playbooks/byo/openshift-cluster/openshift-provisioners.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- include: ../../init/main.yml - -- include: ../../common/openshift-cluster/openshift_provisioners.yml diff --git a/playbooks/common/openshift-cluster/openshift_provisioners.yml b/playbooks/common/openshift-cluster/openshift_provisioners.yml deleted file mode 100644 index b1ca6f606..000000000 --- a/playbooks/common/openshift-cluster/openshift_provisioners.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: OpenShift Provisioners - hosts: oo_first_master - roles: - - openshift_provisioners diff --git a/playbooks/openshift-provisioners/config.yml b/playbooks/openshift-provisioners/config.yml new file mode 100644 index 000000000..c7814207c --- /dev/null +++ b/playbooks/openshift-provisioners/config.yml @@ -0,0 +1,4 @@ +--- +- import_playbook: ../init/main.yml + +- import_playbook: private/config.yml diff --git a/playbooks/openshift-provisioners/private/config.yml b/playbooks/openshift-provisioners/private/config.yml new file mode 100644 index 000000000..b1ca6f606 --- /dev/null +++ b/playbooks/openshift-provisioners/private/config.yml @@ -0,0 +1,5 @@ +--- +- name: OpenShift Provisioners + hosts: oo_first_master + roles: + - openshift_provisioners diff --git a/playbooks/openshift-provisioners/private/roles b/playbooks/openshift-provisioners/private/roles new file mode 120000 index 000000000..20c4c58cf --- /dev/null +++ b/playbooks/openshift-provisioners/private/roles @@ -0,0 +1 @@ +../../../roles \ No newline at end of file -- cgit v1.2.3