rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-06-27 07:16:48 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2000 from SvenDowideit/update-vmware-cloud-init-encoding

Browse Source 
update the encoding key to match docker-machine
This commit is contained in:
Sven Dowideit 2017-07-20 14:17:54 +10:00 committed by GitHub
commit 12409e7e20
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/cloudinit/datasource/vmware/vmware.go
View File

@ -172,7 +172,7 @@ func (v VMWare) FetchMetadata() (metadata datasource.Metadata, err error) {
} }
func (v VMWare) FetchUserdata() ([]byte, error) { func (v VMWare) FetchUserdata() ([]byte, error) {
encoding, err := v.readConfig("cloud-init.config.data.encoding") encoding, err := v.readConfig("cloud-init.data.encoding")
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
docs/os/running-rancheros/cloud/vmware-esxi/index.md
View File

@ -23,7 +23,7 @@ As of v1.1.0, RancherOS automatically detects that it is running on VMware ESXi,
| `dns.server.<x>` | IP address | | `dns.server.<x>` | IP address |
| `dns.domain.<y> | DNS search domain` | | `dns.domain.<y> | DNS search domain` |
| `cloud-init.config.data | string` | | `cloud-init.config.data | string` |
| `cloud-init.config.data.encoding` | {"", "base64", "gzip+base64"} | | `cloud-init.data.encoding` | {"", "base64", "gzip+base64"} |
| `cloud-init.config.url` | URL | | `cloud-init.config.url` | URL |
> **Note:** "n", "m", "l", "x" and "y" are 0-indexed, incrementing integers. The identifier for an interface (`<n>`) is used in the generation of the default interface name in the form `eth<n>`. > **Note:** "n", "m", "l", "x" and "y" are 0-indexed, incrementing integers. The identifier for an interface (`<n>`) is used in the generation of the default interface name in the form `eth<n>`.