Merge pull request #850 from crawford/flags

oems: use --oem flag when running cloudinit

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/cloud-config.yml

@@ -21,7 +21,7 @@ coreos:
 
           [Service]
           Type=oneshot
-          ExecStart=/usr/bin/coreos-cloudinit --from-digitalocean-metadata=http://169.254.169.254/ --convert-netconf=digitalocean
+          ExecStart=/usr/bin/coreos-cloudinit --oem=digitalocean
     oem:
       id: digitalocean
       name: DigitalOcean

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml

@@ -15,7 +15,7 @@ coreos:
 
           [Service]
           Type=oneshot
-          ExecStart=/usr/bin/coreos-cloudinit --from-configdrive=/media/configdrive --from-ec2-metadata=http://169.254.169.254/
+          ExecStart=/usr/bin/coreos-cloudinit --oem=ec2-compat
     oem:
       id: @@OEM_ID@@
       name: @@OEM_NAME@@

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/cloud-config.yml

@@ -21,7 +21,7 @@ coreos:
         content: |
           [Service]
           ExecStart=
-          ExecStart=/usr/bin/coreos-cloudinit --from-configdrive=/media/configdrive --convert-netconf=debian
+          ExecStart=/usr/bin/coreos-cloudinit --oem=rackspace-onmetal
       - name: ping-out.service
         runtime: yes
         enable: yes