Merge "Refix --registry-enabled"

Author: Zuul

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

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

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"

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}

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}