summaryrefslogtreecommitdiffstats
path: root/playbooks/aws
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-11-21 16:56:27 -0500
committerGitHub <noreply@github.com>2017-11-21 16:56:27 -0500
commit8255f668ebac12171098f5ba6cbb74370ec3141c (patch)
tree005604559faa06dcb5cae42c50dd1f47b594fb20 /playbooks/aws
parent51a0cbd42807c91a5e30fa58362b8745a40607f2 (diff)
parent37cfec7fd40bc77c53368e8fc934d551d773c9bd (diff)
downloadopenshift-8255f668ebac12171098f5ba6cbb74370ec3141c.tar.gz
openshift-8255f668ebac12171098f5ba6cbb74370ec3141c.tar.bz2
openshift-8255f668ebac12171098f5ba6cbb74370ec3141c.tar.xz
openshift-8255f668ebac12171098f5ba6cbb74370ec3141c.zip
Merge pull request #6158 from mtnbikenc/consolidate-openshift-node
Playbook Consolidation - openshift-node
Diffstat (limited to 'playbooks/aws')
-rw-r--r--playbooks/aws/openshift-cluster/build_ami.yml2
-rw-r--r--playbooks/aws/openshift-cluster/install.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/aws/openshift-cluster/build_ami.yml b/playbooks/aws/openshift-cluster/build_ami.yml
index fae30eb0a..5815c4975 100644
--- a/playbooks/aws/openshift-cluster/build_ami.yml
+++ b/playbooks/aws/openshift-cluster/build_ami.yml
@@ -33,7 +33,7 @@
# This is the part that installs all of the software and configs for the instance
# to become a node.
-- include: ../../common/openshift-node/image_prep.yml
+- include: ../../openshift-node/private/image_prep.yml
- include: seal_ami.yml
vars:
diff --git a/playbooks/aws/openshift-cluster/install.yml b/playbooks/aws/openshift-cluster/install.yml
index db3f61e5a..3b9f041cf 100644
--- a/playbooks/aws/openshift-cluster/install.yml
+++ b/playbooks/aws/openshift-cluster/install.yml
@@ -39,7 +39,7 @@
include: ../../common/openshift-master/additional_config.yml
- name: include master additional config
- include: ../../common/openshift-node/config.yml
+ include: ../../openshift-node/private/config.yml
- name: include openshift-glusterfs
include: ../../common/openshift-glusterfs/config.yml