Browse Source

Merge "Fix registry on k8s_fedora_atomic"

changes/32/645632/9
Zuul 3 years ago
committed by Gerrit Code Review
parent
commit
4bd3d1cd8c
  1. 2
      magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.yaml
  2. 2
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml

2
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"

2
magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml

@ -348,7 +348,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}

Loading…
Cancel
Save