From 31dbbf54a22202dfcce44dbb82f8bfcb4ea5181c Mon Sep 17 00:00:00 2001
From: Chengcheng Mu <chengcheng.mu@amadeus.com>
Date: Wed, 18 Nov 2015 11:10:16 +0100
Subject: add a volume on master host, in AWS provisioning
---
playbooks/aws/openshift-cluster/templates/user_data.j2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'playbooks/aws/openshift-cluster/templates')
diff --git a/playbooks/aws/openshift-cluster/templates/user_data.j2 b/playbooks/aws/openshift-cluster/templates/user_data.j2
index 82c2f4d57..b7d89eac1 100644
--- a/playbooks/aws/openshift-cluster/templates/user_data.j2
+++ b/playbooks/aws/openshift-cluster/templates/user_data.j2
@@ -19,7 +19,7 @@ fs_setup:
partition: auto
{% endif %}
-{% if type == 'node' %}
+{% if type == 'node' or type == 'master' %}
mounts:
- [ xvdb ]
- [ ephemeral0 ]
--
cgit v1.2.3
From f9d918450b27b8f7429f050ed5f781492406b385 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Wed, 18 Nov 2015 14:38:22 -0500
Subject: small tweaks for adding docker volume for aws master hosts
---
playbooks/aws/openshift-cluster/templates/user_data.j2 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'playbooks/aws/openshift-cluster/templates')
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 ]
--
cgit v1.2.3