Merge pull request #3665 from carmstrong/aws-ebs-for-etcd

fix(contrib/ec2): use EBS volume for etcd data

Author: carmstrong

contrib/ec2/deis.template.json

@@ -275,6 +275,10 @@
           {
             "DeviceName" : "/dev/xvdf",
             "Ebs" : { "VolumeSize" : "100", "VolumeType": { "Ref": "EC2EBSVolumeType" } }
+          },
+          {
+            "DeviceName" : "/dev/xvdg",
+            "Ebs" : { "VolumeSize" : "10", "VolumeType": { "Ref": "EC2EBSVolumeType" } }
           }
         ]
       }

contrib/ec2/gen-json.py

@@ -6,39 +6,6 @@
 CURR_DIR = os.path.dirname(os.path.realpath(__file__))
 
 # Add EC2-specific units to the shared user-data
-FORMAT_EPHEMERAL_VOLUME = '''
-  [Unit]
-  Description=Formats the ephemeral volume
-  ConditionPathExists=!/etc/ephemeral-volume-formatted
-  [Service]
-  Type=oneshot
-  RemainAfterExit=yes
-  ExecStart=/usr/sbin/wipefs -f /dev/xvdb
-  ExecStart=/usr/sbin/mkfs.ext4 -i 4096 -b 4096 /dev/xvdb
-  ExecStart=/bin/touch /etc/ephemeral-volume-formatted
-'''
-MOUNT_EPHEMERAL_VOLUME = '''
-  [Unit]
-  Description=Formats and mounts the ephemeral drive
-  Requires=format-ephemeral-volume.service
-  After=format-ephemeral-volume.service
-  [Mount]
-  What=/dev/xvdb
-  Where=/media/ephemeral
-  Type=ext4
-'''
-PREPARE_ETCD_DATA_DIRECTORY = '''
-  [Unit]
-  Description=Prepares the etcd data directory
-  Requires=media-ephemeral.mount
-  After=media-ephemeral.mount
-  Before=etcd.service
-  [Service]
-  Type=oneshot
-  RemainAfterExit=yes
-  ExecStart=/usr/bin/mkdir -p /media/ephemeral/etcd
-  ExecStart=/usr/bin/chown -R etcd:etcd /media/ephemeral/etcd
-'''
 FORMAT_DOCKER_VOLUME = '''
   [Unit]
   Description=Formats the added EBS volume for Docker
@@ -61,13 +28,45 @@
   Where=/var/lib/docker
   Type=ext4
 '''
+FORMAT_ETCD_VOLUME = '''
+  [Unit]
+  Description=Formats the etcd device
+  ConditionPathExists=!/etc/etcd-volume-formatted
+  [Service]
+  Type=oneshot
+  RemainAfterExit=yes
+  ExecStart=/usr/sbin/wipefs -f /dev/xvdg
+  ExecStart=/usr/sbin/mkfs.ext4 -i 4096 -b 4096 /dev/xvdg
+  ExecStart=/bin/touch /etc/etcd-volume-formatted
+'''
+MOUNT_ETCD_VOLUME = '''
+  [Unit]
+  Description=Formats and mounts the ephemeral drive
+  Requires=format-etcd-volume.service
+  After=format-etcd-volume.service
+  [Mount]
+  What=/dev/xvdg
+  Where=/media/etcd
+  Type=ext4
+'''
+PREPARE_ETCD_DATA_DIRECTORY = '''
+  [Unit]
+  Description=Prepares the etcd data directory
+  Requires=media-etcd.mount
+  After=media-etcd.mount
+  Before=etcd.service
+  [Service]
+  Type=oneshot
+  RemainAfterExit=yes
+  ExecStart=/usr/bin/chown -R etcd:etcd /media/etcd
+'''
 
 new_units = [
-  dict({'name': 'format-ephemeral-volume.service', 'command': 'start', 'content': FORMAT_EPHEMERAL_VOLUME}),
-  dict({'name': 'media-ephemeral.mount', 'command': 'start', 'content': MOUNT_EPHEMERAL_VOLUME}),
-  dict({'name': 'prepare-etcd-data-directory.service', 'command': 'start', 'content': PREPARE_ETCD_DATA_DIRECTORY}),
   dict({'name': 'format-docker-volume.service', 'command': 'start', 'content': FORMAT_DOCKER_VOLUME}),
-  dict({'name': 'var-lib-docker.mount', 'command': 'start', 'content': MOUNT_DOCKER_VOLUME})
+  dict({'name': 'var-lib-docker.mount', 'command': 'start', 'content': MOUNT_DOCKER_VOLUME}),
+  dict({'name': 'format-etcd-volume.service', 'command': 'start', 'content': FORMAT_ETCD_VOLUME}),
+  dict({'name': 'media-etcd.mount', 'command': 'start', 'content': MOUNT_ETCD_VOLUME}),
+  dict({'name': 'prepare-etcd-data-directory.service', 'command': 'start', 'content': PREPARE_ETCD_DATA_DIRECTORY})
 ]
 
 data = yaml.load(file(os.path.join(CURR_DIR, '..', 'coreos', 'user-data'), 'r'))
@@ -76,8 +75,8 @@
 # are started
 data['coreos']['units'] = new_units + data['coreos']['units']
 
-# configure etcd to use the ephemeral drive
-data['coreos']['etcd']['data-dir'] = '/media/ephemeral/etcd'
+# configure etcd to use its EBS volume
+data['coreos']['etcd']['data-dir'] = '/media/etcd'
 
 header = ["#cloud-config", "---"]
 dump = yaml.dump(data, default_flow_style=False)