From 00522c5ba20bdd8939e3ff1d8daca48c2507dde7 Mon Sep 17 00:00:00 2001 From: "Adolfo R. Brandes" Date: Thu, 11 Apr 2019 14:17:41 -0300 Subject: [PATCH] Fix registry on k8s_fedora_atomic This fixes an issue with --registry-enabled in k8s_fedora_atomic where the registry container fails to start in the minion due to two missing heat parameters: TRUSTEE_USERNAME and TRUSTEE_DOMAIN_ID. Change-Id: Ib93a7c0f761d047da3408703a5cf4208821acb33 Task: 23067 Story: 2003033 --- .../templates/kubernetes/fragments/write-heat-params.yaml | 2 ++ magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.yaml b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.yaml index f425c3973f..2e957fb065 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.yaml +++ b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.yaml @@ -42,7 +42,9 @@ write_files: 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 c7aa30cc12..e1d794c267 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml @@ -343,7 +343,9 @@ resources: $KUBE_VERSION: {get_param: kube_version} $WAIT_CURL: {get_attr: [minion_wait_handle, curl_cli]} $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}