summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-11-22 15:50:29 -0500
committerGitHub <noreply@github.com>2017-11-22 15:50:29 -0500
commit5874c9f21e750fa665937d629dad0c0d34839185 (patch)
treed7ccd405d5aae55e8ca107ea464331b98d04d67e /playbooks
parent50637899d574cd1c47749eea96288085d0e68a27 (diff)
parentd32ab495ae636bb381b4e325ca4f4f913947187d (diff)
downloadopenshift-5874c9f21e750fa665937d629dad0c0d34839185.tar.gz
openshift-5874c9f21e750fa665937d629dad0c0d34839185.tar.bz2
openshift-5874c9f21e750fa665937d629dad0c0d34839185.tar.xz
openshift-5874c9f21e750fa665937d629dad0c0d34839185.zip
Merge pull request #6236 from mtnbikenc/consolidate-openshift-provisioners
Playbook Consolidation - openshift-provisioners
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/byo/openshift-cluster/openshift-provisioners.yml4
-rw-r--r--playbooks/openshift-provisioners/config.yml4
-rw-r--r--playbooks/openshift-provisioners/private/config.yml (renamed from playbooks/common/openshift-cluster/openshift_provisioners.yml)0
l---------playbooks/openshift-provisioners/private/roles1
4 files changed, 5 insertions, 4 deletions
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/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/common/openshift-cluster/openshift_provisioners.yml b/playbooks/openshift-provisioners/private/config.yml
index b1ca6f606..b1ca6f606 100644
--- a/playbooks/common/openshift-cluster/openshift_provisioners.yml
+++ b/playbooks/openshift-provisioners/private/config.yml
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