summaryrefslogtreecommitdiffstats
path: root/playbooks/aws/openshift-cluster/templates
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-11-18 14:38:22 -0500
committerJason DeTiberus <jdetiber@redhat.com>2015-11-18 14:51:46 -0500
commitf9d918450b27b8f7429f050ed5f781492406b385 (patch)
treec4dbe821b26bcabbcec5bab07530cdb9f42ebf71 /playbooks/aws/openshift-cluster/templates
parent31dbbf54a22202dfcce44dbb82f8bfcb4ea5181c (diff)
downloadopenshift-f9d918450b27b8f7429f050ed5f781492406b385.tar.gz
openshift-f9d918450b27b8f7429f050ed5f781492406b385.tar.bz2
openshift-f9d918450b27b8f7429f050ed5f781492406b385.tar.xz
openshift-f9d918450b27b8f7429f050ed5f781492406b385.zip
small tweaks for adding docker volume for aws master hosts
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 b7d89eac1..22ab84977 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' or type == 'master' %}
+{% if type in ['node', 'master'] and 'docker' in volume_defs[type] %}
mounts:
- [ xvdb ]
- [ ephemeral0 ]