summaryrefslogtreecommitdiffstats
path: root/playbooks/aws/openshift-cluster/templates
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-04-19 14:24:00 -0400
committerJason DeTiberus <jdetiber@redhat.com>2016-04-29 12:21:38 -0400
commitb60e949da09a024b85366add7c7a26276b635093 (patch)
tree64c5621f9ec2a41f524f639c38504dc57bc2a7cf /playbooks/aws/openshift-cluster/templates
parent82126ed401be4f7272c4f896dfef299828c660f6 (diff)
downloadopenshift-b60e949da09a024b85366add7c7a26276b635093.tar.gz
openshift-b60e949da09a024b85366add7c7a26276b635093.tar.bz2
openshift-b60e949da09a024b85366add7c7a26276b635093.tar.xz
openshift-b60e949da09a024b85366add7c7a26276b635093.zip
fix up variable references remove "online" support from bin/cluster
Diffstat (limited to 'playbooks/aws/openshift-cluster/templates')
-rw-r--r--playbooks/aws/openshift-cluster/templates/user_data.j231
1 files changed, 0 insertions, 31 deletions
diff --git a/playbooks/aws/openshift-cluster/templates/user_data.j2 b/playbooks/aws/openshift-cluster/templates/user_data.j2
index 4b8554c87..2a3974a8c 100644
--- a/playbooks/aws/openshift-cluster/templates/user_data.j2
+++ b/playbooks/aws/openshift-cluster/templates/user_data.j2
@@ -1,24 +1,4 @@
#cloud-config
-{% if type == 'etcd' and 'etcd' in volume_defs[type] %}
-cloud_config_modules:
-- disk_setup
-- mounts
-
-mounts:
-- [ xvdb, /var/lib/etcd, xfs, "defaults" ]
-
-disk_setup:
- xvdb:
- table_type: mbr
- layout: True
-
-fs_setup:
-- label: etcd_storage
- filesystem: xfs
- device: /dev/xvdb
- partition: auto
-{% endif %}
-
{% if type in ['node', 'master'] and 'docker' in volume_defs[type] %}
mounts:
- [ xvdb ]
@@ -33,17 +13,6 @@ write_files:
permissions: '0644'
{% endif %}
-{% if deployment_type == 'online' %}
-devices: ['/var'] # Workaround for https://bugs.launchpad.net/bugs/1455436
-
-disable_root: 0
-growpart:
- mode: auto
- devices: ['/var']
-runcmd:
-- xfs_growfs /var
-{% endif %}
-
{% if deployment_vars[deployment_type].become %}
- path: /etc/sudoers.d/99-{{ deployment_vars[deployment_type].ssh_user }}-cloud-init-requiretty
permissions: 440