From 4b1ba075ff0e5785cddba605e313a0aa82d84fb3 Mon Sep 17 00:00:00 2001 From: Jake Yip Date: Wed, 13 Jan 2021 21:40:15 +1100 Subject: [PATCH] Refix --registry-enabled This fixes an issue with --registry-enabled that was previously fixed [1] but somehow dropped after a refactoring [2] [1] Change Ib93a7c0f761d047da3408703a5cf4208821acb33 [2] Change Ibbed59bc135969174a20e5243ff8464908801a23 Task: 41306 Story: 2008383 Change-Id: I76fedd34edec55f5a906a96672529ed15775f5da (cherry picked from commit 679a174a0a630b5670dc38699370e61a6c056446) --- .../fragments/configure-docker-registry.sh | 2 +- .../templates/fragments/enable-docker-registry.sh | 14 ++++++-------- .../kubernetes/fragments/write-heat-params.sh | 2 ++ .../k8s_fedora_atomic_v1/templates/kubeminion.yaml | 2 ++ .../k8s_fedora_coreos_v1/templates/kubeminion.yaml | 2 ++ 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/magnum/drivers/common/templates/fragments/configure-docker-registry.sh b/magnum/drivers/common/templates/fragments/configure-docker-registry.sh index 68296f8f4e..47430a6a14 100644 --- a/magnum/drivers/common/templates/fragments/configure-docker-registry.sh +++ b/magnum/drivers/common/templates/fragments/configure-docker-registry.sh @@ -2,7 +2,7 @@ . /etc/sysconfig/heat-params -if [ "$REGISTRY_ENABLED" = "True" ]; then +if [ "$(echo $REGISTRY_ENABLED | tr '[:upper:]' '[:lower:]')" = "true" ]; then ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost" $ssh_cmd cat > /etc/sysconfig/registry-config.yml << EOF version: 0.1 diff --git a/magnum/drivers/common/templates/fragments/enable-docker-registry.sh b/magnum/drivers/common/templates/fragments/enable-docker-registry.sh index 1eb8001b74..50b24cf339 100644 --- a/magnum/drivers/common/templates/fragments/enable-docker-registry.sh +++ b/magnum/drivers/common/templates/fragments/enable-docker-registry.sh @@ -2,13 +2,11 @@ . /etc/sysconfig/heat-params -if [ "$REGISTRY_ENABLED" = "False" ]; then - exit 0 -fi - ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost" -echo "starting docker registry ..." -$ssh_cmd systemctl daemon-reload -$ssh_cmd systemctl enable registry -$ssh_cmd systemctl --no-block start registry +if [ "$(echo $REGISTRY_ENABLED | tr '[:upper:]' '[:lower:]')" = "true" ]; then + echo "starting docker registry ..." + $ssh_cmd systemctl daemon-reload + $ssh_cmd systemctl enable registry + $ssh_cmd systemctl --no-block start registry +fi diff --git a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.sh b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.sh index d24b7472a5..3283fa60a5 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.sh @@ -62,7 +62,9 @@ FLANNEL_NETWORK_CIDR="$FLANNEL_NETWORK_CIDR" PODS_NETWORK_CIDR="$PODS_NETWORK_CIDR" KUBE_VERSION="$KUBE_VERSION" TRUSTEE_USER_ID="$TRUSTEE_USER_ID" +TRUSTEE_USERNAME="$TRUSTEE_USERNAME" TRUSTEE_PASSWORD="$TRUSTEE_PASSWORD" +TRUSTEE_DOMAIN_ID="$TRUSTEE_DOMAIN_ID" TRUST_ID="$TRUST_ID" CLOUD_PROVIDER_ENABLED="$CLOUD_PROVIDER_ENABLED" INSECURE_REGISTRY_URL="$INSECURE_REGISTRY_URL" diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml index bc040bd515..1bc512a38e 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml @@ -444,7 +444,9 @@ resources: $PODS_NETWORK_CIDR: {get_param: pods_network_cidr} $KUBE_VERSION: {get_param: kube_version} $TRUSTEE_USER_ID: {get_param: trustee_user_id} + $TRUSTEE_USERNAME: {get_param: trustee_username} $TRUSTEE_PASSWORD: {get_param: trustee_password} + $TRUSTEE_DOMAIN_ID: {get_param: trustee_domain_id} $TRUST_ID: {get_param: trust_id} $AUTH_URL: {get_param: auth_url} $CLOUD_PROVIDER_ENABLED: {get_param: cloud_provider_enabled} diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubeminion.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubeminion.yaml index 9ac797b1ca..98b10db093 100644 --- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubeminion.yaml +++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubeminion.yaml @@ -469,7 +469,9 @@ resources: $PODS_NETWORK_CIDR: {get_param: pods_network_cidr} $KUBE_VERSION: {get_param: kube_version} $TRUSTEE_USER_ID: {get_param: trustee_user_id} + $TRUSTEE_USERNAME: {get_param: trustee_username} $TRUSTEE_PASSWORD: {get_param: trustee_password} + $TRUSTEE_DOMAIN_ID: {get_param: trustee_domain_id} $TRUST_ID: {get_param: trust_id} $AUTH_URL: {get_param: auth_url} $CLOUD_PROVIDER_ENABLED: {get_param: cloud_provider_enabled}