From c0c144bd5654a0f14901b16f1240ce890fbe1021 Mon Sep 17 00:00:00 2001 From: kayrus Date: Tue, 22 Sep 2015 13:30:30 +0200 Subject: [PATCH] Added additional vmware info, fixed cli help --- Documentation/cloud-config-locations.md | 5 +++++ Documentation/vmware-backdoor.md | 10 ++++++++-- coreos-cloudinit.go | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Documentation/cloud-config-locations.md b/Documentation/cloud-config-locations.md index fd8c2e7..404d93a 100644 --- a/Documentation/cloud-config-locations.md +++ b/Documentation/cloud-config-locations.md @@ -9,8 +9,13 @@ Location | Description |Kernel command line: `cloud-config-url=http://example.com/user_data`.| You can find this string using this command `cat /proc/cmdline`. Usually used in [PXE](/os/docs/latest/booting-with-pxe.html) or [iPXE](/os/docs/latest/booting-with-ipxe.html) boots.| |`/var/lib/coreos-install/user_data`| When you install CoreOS manually using the [coreos-install](/os/docs/latest/installing-to-disk.html) tool. Usually used in bare metal installations.| |`/usr/share/oem/cloud-config.yml`| Path for OEM images.| +|`/var/lib/coreos-vagrant/vagrantfile-user-data`| Vagrant OEM scripts automatically store Cloud-Config into this path. | |`/var/lib/waagent/CustomData`| Azure platform uses OEM path for first Cloud-Config initialization and then `/var/lib/waagent/CustomData` to apply your settings.| |`http://169.254.169.254/metadata/v1/user-data` `http://169.254.169.254/2009-04-04/user-data` `https://metadata.packet.net/userdata`|DigitalOcean, EC2 and Packet cloud providers correspondingly use these URLs to download Cloud-Config.| +|`/usr/share/oem/bin/vmtoolsd --cmd "info-get guestinfo.coreos.config.data"`|Cloud-Config provided by [VMware Backdoor][VMware Backdoor]| +|`/usr/share/oem/bin/vmtoolsd --cmd "info-get guestinfo.coreos.config.url"`|Cloud-Config URL provided by [VMware Backdoor][VMware Backdoor]| + +[VMware Backdoor]: vmware-backdoor.md You can also run the `coreos-cloudinit` tool manually and provide a path to your custom Cloud-Config file: diff --git a/Documentation/vmware-backdoor.md b/Documentation/vmware-backdoor.md index 46fd68b..8c0fc74 100644 --- a/Documentation/vmware-backdoor.md +++ b/Documentation/vmware-backdoor.md @@ -1,7 +1,9 @@ -# VMware Backdoor # +# VMware Backdoor + +## Cloud-Config Options List coreos-cloudinit is capable of reading userdata and metadata from the VMware -backdoor. This datasource can be enable with the `--from-vmware-backdoor` flag. +backdoor. This datasource can be enabled with the `--from-vmware-backdoor` flag. Userdata and metadata are passed from the hypervisor to the virtual machine through guest variables. The following guest variables and their expected types are supported by coreos-cloudinit: @@ -24,3 +26,7 @@ are supported by coreos-cloudinit: Note: "n", "m", "l", and "x" are 0-indexed, incrementing integers. The identifier for the interfaces does not correspond to anything outside of this configuration; it is merely for mapping configuration values to each interface. + +Please refer to [link][vmware] to know more how to run CoreOS on VMware. + +[vmware]: https://github.com/coreos/docs/blob/master/os/booting-on-vmware.md diff --git a/coreos-cloudinit.go b/coreos-cloudinit.go index 11fa3fe..2d77c0a 100644 --- a/coreos-cloudinit.go +++ b/coreos-cloudinit.go @@ -162,7 +162,7 @@ func main() { dss := getDatasources() if len(dss) == 0 { - fmt.Println("Provide at least one of --from-file, --from-configdrive, --from-ec2-metadata, --from-cloudsigma-metadata, --from-packet-metadata, --from-url or --from-proc-cmdline") + fmt.Println("Provide at least one of --from-file, --from-configdrive, --from-ec2-metadata, --from-cloudsigma-metadata, --from-packet-metadata, --from-vmware-backdoor, --from-digitalocean-metadata, --from-vmware-backdoor, --from-waagent, --from-url or --from-proc-cmdline") os.Exit(2) }