summaryrefslogtreecommitdiffstats
path: root/playbooks/aws/openshift-cluster
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-11-22 11:02:21 -0500
committerGitHub <noreply@github.com>2017-11-22 11:02:21 -0500
commit012be35217f7415d50afe5e74b7e2e995feea6b5 (patch)
treeaefe2efd52afcc36f3c9c504e70a9cc281371b7a /playbooks/aws/openshift-cluster
parentda85fd6aa7d71f97bfcaad3a2003921a5581a067 (diff)
parent78f11c8f671015d40a630208b548d0790ec3a823 (diff)
downloadopenshift-012be35217f7415d50afe5e74b7e2e995feea6b5.tar.gz
openshift-012be35217f7415d50afe5e74b7e2e995feea6b5.tar.bz2
openshift-012be35217f7415d50afe5e74b7e2e995feea6b5.tar.xz
openshift-012be35217f7415d50afe5e74b7e2e995feea6b5.zip
Merge pull request #6151 from mtnbikenc/consolidate-openshift-master
Playbook Consolidation - openshift-master
Diffstat (limited to 'playbooks/aws/openshift-cluster')
-rw-r--r--playbooks/aws/openshift-cluster/install.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/aws/openshift-cluster/install.yml b/playbooks/aws/openshift-cluster/install.yml
index 56ca25eb4..6c177bd21 100644
--- a/playbooks/aws/openshift-cluster/install.yml
+++ b/playbooks/aws/openshift-cluster/install.yml
@@ -33,10 +33,10 @@
when: groups.oo_lb_to_config | default([]) | count > 0
- name: include openshift-master config
- include: ../../common/openshift-master/config.yml
+ include: ../../openshift-master/private/config.yml
- name: include master additional config
- include: ../../common/openshift-master/additional_config.yml
+ include: ../../openshift-master/private/additional_config.yml
- name: include master additional config
include: ../../openshift-node/private/config.yml