From b1e85d308654147890c6d27315d2803c6d9bf4e4 Mon Sep 17 00:00:00 2001 From: Derek Gonyeo Date: Tue, 18 Apr 2017 13:28:17 -0700 Subject: [PATCH] coreos-metadata: move provider into environment variable By moving specifying how to get the provider into an environment variable, it can be overridden via an environment varaible (which will be necessary on openstack) --- ...s-metadata-0.8.0.ebuild => coreos-metadata-0.8.0-r1.ebuild} | 0 .../coreos-base/coreos-metadata/files/coreos-metadata.service | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/{coreos-metadata-0.8.0.ebuild => coreos-metadata-0.8.0-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.8.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.8.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.8.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.8.0-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata.service index 12e391d740..297177487f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata.service +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata.service @@ -3,7 +3,8 @@ Description=CoreOS Metadata Agent [Service] Type=oneshot -ExecStart=/usr/bin/coreos-metadata --cmdline --attributes=/run/metadata/coreos +Environment=COREOS_METADATA_OPT_PROVIDER=--cmdline +ExecStart=/usr/bin/coreos-metadata ${COREOS_METADATA_OPT_PROVIDER} --attributes=/run/metadata/coreos [Install] RequiredBy=metadata.target