From 5663112822d645bc4a1a51a5e496659ee509ffca Mon Sep 17 00:00:00 2001 From: Nick Jones Date: Wed, 18 Oct 2017 22:47:03 +0100 Subject: [PATCH 1/2] Fix typo which broke metadata retrieval Signed-off-by: Nick Jones --- pkg/metadata/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/metadata/main.go b/pkg/metadata/main.go index 37745f429..05572f8ed 100644 --- a/pkg/metadata/main.go +++ b/pkg/metadata/main.go @@ -22,7 +22,7 @@ const ( // Standard AWS-compatible Metadata URLs userDataURL = "http://169.254.169.254/latest/user-data" - metaDataURL = "http://169.254.169.254/latest/meta-data" + metaDataURL = "http://169.254.169.254/latest/meta-data/" ) // Provider is a generic interface for metadata/userdata providers. From 490ac8a8f3cc4207a40c7f548598ccdf46e7019c Mon Sep 17 00:00:00 2001 From: Nick Jones Date: Wed, 18 Oct 2017 22:47:26 +0100 Subject: [PATCH 2/2] [OpenStack] Add example configuration Signed-off-by: Nick Jones --- examples/openstack.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 examples/openstack.yml diff --git a/examples/openstack.yml b/examples/openstack.yml new file mode 100644 index 000000000..5e80e7c9b --- /dev/null +++ b/examples/openstack.yml @@ -0,0 +1,36 @@ +kernel: + image: linuxkit/kernel:4.9.54 + cmdline: "console=ttyS0" +init: + - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 + - linuxkit/runc:52f92cb577879ce4cfe4e89be2d63af82523fc92 + - linuxkit/containerd:ed8e8f92e24dd4b94260cf147594ae3fd13a2182 + - linuxkit/ca-certificates:ea3c4c120f929f4f07ac8535d75933365b5e9582 +onboot: + - name: sysctl + image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 + - name: dhcpcd + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e + command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] + - name: metadata + image: linuxkit/metadata:4c588dba73ae7bec6f873130f715ba44082c4278 + command: ["/usr/bin/metadata", "openstack"] +services: + - name: rngd + image: linuxkit/rngd:45ed7759dd927f4cce3863073ea2e0da1d52a427 + - name: sshd + image: linuxkit/sshd:4a2fc7be31fa57dcade391de6173e0af55296e7f + binds: + - /var/config/ssh/authorized_keys:/root/.ssh/authorized_keys + - name: nginx + image: nginx:alpine + capabilities: + - CAP_NET_BIND_SERVICE + - CAP_CHOWN + - CAP_SETUID + - CAP_SETGID + - CAP_DAC_OVERRIDE +trust: + org: + - linuxkit + - library