Merge pull request #4669 from helgi/aws-disk

ref(contrib/aws): remove disk replacements that were forgotten in #4444

Author: helgi

contrib/aws/gen-json.py

@@ -108,9 +108,6 @@ def coreos_amis(channel, version):
 header = ["#cloud-config", "---"]
 dump = yaml.dump(data, default_flow_style=False)
 
-# configure etcd to use its EBS volume
-dump = dump.replace('ETCD_HOST_DATA_DIR=/var/lib/etcd2', 'ETCD_HOST_DATA_DIR=/media/etcd')
-
 template = json.load(open(os.path.join(CURR_DIR, 'deis.template.json'), 'r'))
 
 template['Resources']['CoreOSServerLaunchConfig']['Properties']['UserData']['Fn::Base64']['Fn::Join'] = ["\n", header + dump.split("\n")]