summaryrefslogtreecommitdiffstats
path: root/playbooks/aws/openshift-cluster/templates
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-11-19 10:34:19 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2015-11-19 10:34:19 -0500
commit6ee1a17c508327bb30b4a6563859358cc13786ef (patch)
tree8bdedda07d526f5e49a649d2036b4998f90dd5cb /playbooks/aws/openshift-cluster/templates
parent631132c2f0e043b2d86bfd999eef5be001090eeb (diff)
parent0925d936bf1d5b22951b644d9430f443f0551cac (diff)
downloadopenshift-6ee1a17c508327bb30b4a6563859358cc13786ef.tar.gz
openshift-6ee1a17c508327bb30b4a6563859358cc13786ef.tar.bz2
openshift-6ee1a17c508327bb30b4a6563859358cc13786ef.tar.xz
openshift-6ee1a17c508327bb30b4a6563859358cc13786ef.zip
Merge pull request #933 from menren/dockerOnMasterAWS
Docker on master aws
Diffstat (limited to 'playbooks/aws/openshift-cluster/templates')
-rw-r--r--playbooks/aws/openshift-cluster/templates/user_data.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/aws/openshift-cluster/templates/user_data.j2 b/playbooks/aws/openshift-cluster/templates/user_data.j2
index ea4c05ca8..3621a7d7d 100644
--- a/playbooks/aws/openshift-cluster/templates/user_data.j2
+++ b/playbooks/aws/openshift-cluster/templates/user_data.j2
@@ -1,5 +1,5 @@
#cloud-config
-{% if type =='etcd' %}
+{% if type == 'etcd' and 'etcd' in volume_defs[type] %}
cloud_config_modules:
- disk_setup
- mounts
@@ -19,7 +19,7 @@ fs_setup:
partition: auto
{% endif %}
-{% if type == 'node' %}
+{% if type in ['node', 'master'] and 'docker' in volume_defs[type] %}
mounts:
- [ xvdb ]
- [ ephemeral0 ]