diff --git a/magnum/drivers/common/templates/kubernetes/fragments/add-proxy.sh b/magnum/drivers/common/templates/kubernetes/fragments/add-proxy.sh index d22a02618d..1d7043acc3 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/add-proxy.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/add-proxy.sh @@ -1,5 +1,3 @@ -#!/bin/sh - set +x . /etc/sysconfig/heat-params set -x diff --git a/magnum/drivers/common/templates/kubernetes/fragments/calico-service-v3-3-x.sh b/magnum/drivers/common/templates/kubernetes/fragments/calico-service-v3-3-x.sh index 60267cce9a..7ded4016ee 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/calico-service-v3-3-x.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/calico-service-v3-3-x.sh @@ -1,5 +1,3 @@ -#!/bin/sh - step="calico-service-v3-3-x" printf "Starting to run ${step}\n" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/calico-service.sh b/magnum/drivers/common/templates/kubernetes/fragments/calico-service.sh index f90b8f3a7f..0a84bfad2f 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/calico-service.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/calico-service.sh @@ -1,4 +1,3 @@ -#!/bin/sh step="calico-service" printf "Starting to run ${step}\n" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh index b7e5ff8983..7cc95bfdf4 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh @@ -1,5 +1,3 @@ -#!/bin/sh - . /etc/sysconfig/heat-params set -x diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh index df96bcfae2..a39ac77b71 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh @@ -1,5 +1,3 @@ -#!/bin/bash - set +x . /etc/sysconfig/heat-params set -x @@ -405,6 +403,7 @@ EOF echo "export KUBECONFIG=${ADMIN_KUBECONFIG}" >> /etc/bashrc chown root:root ${ADMIN_KUBECONFIG} chmod 600 ${ADMIN_KUBECONFIG} +export KUBECONFIG=${ADMIN_KUBECONFIG} # Add controller manager args KUBE_CONTROLLER_MANAGER_ARGS="--leader-elect=true" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh index 9eccba3e0b..37401ad0cb 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh @@ -1,5 +1,3 @@ -#!/bin/bash - set +x . /etc/sysconfig/heat-params set -x diff --git a/magnum/drivers/common/templates/kubernetes/fragments/core-dns-service.sh b/magnum/drivers/common/templates/kubernetes/fragments/core-dns-service.sh index 3d961f7c97..2391fc11e8 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/core-dns-service.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/core-dns-service.sh @@ -1,5 +1,3 @@ -#!/bin/sh - step="core-dns-service" printf "Starting to run ${step}\n" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/disable-selinux.sh b/magnum/drivers/common/templates/kubernetes/fragments/disable-selinux.sh index b8d5107985..e30a6b530d 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/disable-selinux.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/disable-selinux.sh @@ -1,5 +1,4 @@ #cloud-boothook -#!/bin/sh setenforce `[[ "$SELINUX_MODE" == "enforcing" ]] && echo 1 || echo 0` sed -i ' diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-auto-healing.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-auto-healing.sh index be442ea783..4024fc0ea3 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-auto-healing.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-auto-healing.sh @@ -1,5 +1,3 @@ -#!/bin/sh - step="enable-node-problem-detector" printf "Starting to run ${step}\n" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-auto-scaling.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-auto-scaling.sh index 908f8f6637..6e3f1826e4 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-auto-scaling.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-auto-scaling.sh @@ -1,5 +1,3 @@ -#!/bin/sh - step="enable-auto-scaling" printf "Starting to run ${step}\n" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-cert-api-manager.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-cert-api-manager.sh index 7fed859d41..b34cee1c94 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-cert-api-manager.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-cert-api-manager.sh @@ -1,5 +1,3 @@ -#!/bin/sh - step="enable-cert-api-manager" printf "Starting to run ${step}\n" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-cinder-csi.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-cinder-csi.sh index 2b3e32ee7d..f198feb500 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-cinder-csi.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-cinder-csi.sh @@ -1,5 +1,3 @@ -#!/bin/sh - step="enable-cinder-csi" printf "Starting to run ${step}\n" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-helm-tiller.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-helm-tiller.sh index fbd09b9eb8..78c160458c 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-helm-tiller.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-helm-tiller.sh @@ -1,5 +1,3 @@ -#!/bin/bash - . /etc/sysconfig/heat-params step="enable-helm-tiller" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-controller.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-controller.sh index a76c7d6116..23eae54440 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-controller.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-controller.sh @@ -1,5 +1,3 @@ -#!/bin/sh - step="enable-ingress-controller" printf "Starting to run ${step}\n" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-keystone-auth.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-keystone-auth.sh index 72cdde5dc9..787878d498 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-keystone-auth.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-keystone-auth.sh @@ -1,5 +1,3 @@ -#!/bin/sh - . /etc/sysconfig/heat-params step="enable-keystone-auth" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh index 3b4c5edcf5..5586a1fac8 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh @@ -1,5 +1,3 @@ -#!/bin/sh - step="enable-prometheus-monitoring" printf "Starting to run ${step}\n" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh index 679441d9ac..6d4e624c53 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh @@ -1,5 +1,3 @@ -#!/bin/sh - . /etc/sysconfig/heat-params ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-services-minion.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-services-minion.sh index d492b8176d..17d5e65474 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-services-minion.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-services-minion.sh @@ -1,5 +1,3 @@ -#!/bin/sh - set -x ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/flannel-service.sh b/magnum/drivers/common/templates/kubernetes/fragments/flannel-service.sh index effcf4716e..ada71249c4 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/flannel-service.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/flannel-service.sh @@ -1,5 +1,3 @@ -#!/bin/bash - set -e set +x . /etc/sysconfig/heat-params diff --git a/magnum/drivers/common/templates/kubernetes/fragments/install-clients.sh b/magnum/drivers/common/templates/kubernetes/fragments/install-clients.sh index 1258cb82fd..21117a602c 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/install-clients.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/install-clients.sh @@ -1,4 +1,3 @@ -#!/bin/bash step="install-clients" printf "Starting to run ${step}\n" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/install-cri.sh b/magnum/drivers/common/templates/kubernetes/fragments/install-cri.sh index 59e5b18b5a..e82d9309a6 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/install-cri.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/install-cri.sh @@ -1,5 +1,3 @@ -#!/bin/bash - set +x echo "START: install cri" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/install-helm-modules.sh b/magnum/drivers/common/templates/kubernetes/fragments/install-helm-modules.sh index 41fdf3836f..87a20ee448 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/install-helm-modules.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/install-helm-modules.sh @@ -1,5 +1,3 @@ -#!/bin/bash - step="install-helm-modules" echo "START: ${step}" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh b/magnum/drivers/common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh index 5687c27935..c53ee67021 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh @@ -1,5 +1,3 @@ -#!/bin/sh - step="kube-apiserver-to-kubelet-role" printf "Starting to run ${step}\n" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/kube-dashboard-service.sh b/magnum/drivers/common/templates/kubernetes/fragments/kube-dashboard-service.sh index 34e1f27a4e..6fcd2c5bae 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/kube-dashboard-service.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/kube-dashboard-service.sh @@ -1,5 +1,3 @@ -#!/bin/sh - step="kube-dashboard-service" printf "Starting to run ${step}\n" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/make-cert-client.sh b/magnum/drivers/common/templates/kubernetes/fragments/make-cert-client.sh index a90fa928e6..858c136c73 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/make-cert-client.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/make-cert-client.sh @@ -1,5 +1,3 @@ -#!/bin/sh - # Copyright 2014 The Kubernetes Authors All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/magnum/drivers/common/templates/kubernetes/fragments/make-cert.sh b/magnum/drivers/common/templates/kubernetes/fragments/make-cert.sh index 8703de865a..2089f0833c 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/make-cert.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/make-cert.sh @@ -1,5 +1,3 @@ -#!/bin/sh - # Copyright 2014 The Kubernetes Authors All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh b/magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh index ece9bc9d42..68fcae4a03 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/start-container-agent.sh @@ -1,5 +1,3 @@ -#!/bin/bash - set -x set +u HTTP_PROXY="$HTTP_PROXY" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/upgrade-kubernetes.sh b/magnum/drivers/common/templates/kubernetes/fragments/upgrade-kubernetes.sh index 557f4b29d3..6cb7a52321 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/upgrade-kubernetes.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/upgrade-kubernetes.sh @@ -1,5 +1,3 @@ -#!/bin/bash - . /etc/sysconfig/heat-params set -x diff --git a/magnum/drivers/common/templates/kubernetes/fragments/wc-notify-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/wc-notify-master.sh index 6544317721..4010d07f2b 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/wc-notify-master.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/wc-notify-master.sh @@ -1,5 +1,3 @@ -#!/bin/sh - . /etc/sysconfig/heat-params if [ "$VERIFY_CA" == "True" ]; then diff --git a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.sh index 38925757a8..25d5d7706a 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.sh @@ -1,5 +1,3 @@ -#!/bin/sh - echo "START: write-heat-params" arch=$(uname -m) 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 1c9be30881..0e4934d2e3 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.sh @@ -1,5 +1,3 @@ -#!/bin/sh - echo "START: write-heat-params" arch=$(uname -m) diff --git a/magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh b/magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh index 39b91ac4f8..d68924ee9b 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh @@ -1,5 +1,3 @@ -#!/bin/sh - set +x . /etc/sysconfig/heat-params set -x diff --git a/magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh b/magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh index 76ee0ba20a..ca11df789c 100755 --- a/magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh +++ b/magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh @@ -1,5 +1,3 @@ -#!/bin/bash - set +x . /etc/sysconfig/heat-params set -ex diff --git a/magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh b/magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh index cf59f33d1c..7538297e63 100755 --- a/magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh +++ b/magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh @@ -1,5 +1,3 @@ -#!/bin/bash - set +x . /etc/sysconfig/heat-params set -ex diff --git a/magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh b/magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh index 0e469678b4..ed299c86d5 100755 --- a/magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh +++ b/magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh @@ -1,5 +1,3 @@ -#!/bin/bash - set +x . /etc/sysconfig/heat-params set -ex diff --git a/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh b/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh index 5e01f102d4..a699081eff 100755 --- a/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh +++ b/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh @@ -1,5 +1,3 @@ -#!/bin/bash - set +x . /etc/sysconfig/heat-params set -ex diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml index 42f560b3c5..8eedff1ea1 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml @@ -1271,6 +1271,7 @@ resources: list_join: - "\n" - + - "#!/bin/bash" - get_file: ../../common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh - get_file: ../../common/templates/kubernetes/fragments/core-dns-service.sh - if: diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml index adbc8f53e0..7e42049339 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml @@ -706,6 +706,7 @@ resources: list_join: - "\n" - + - "#!/bin/bash" - str_replace: template: {get_file: ../../common/templates/kubernetes/fragments/write-heat-params-master.sh} params: @@ -995,7 +996,11 @@ resources: - name: ostree_remote_input - name: ostree_commit_input config: - get_file: ../../common/templates/kubernetes/fragments/upgrade-kubernetes.sh + list_join: + - "\n" + - + - "#!/bin/bash" + - get_file: ../../common/templates/kubernetes/fragments/upgrade-kubernetes.sh upgrade_kubernetes_deployment: type: OS::Heat::SoftwareDeployment diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml index 3287329342..69c8216ece 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml @@ -400,6 +400,7 @@ resources: list_join: - "\n" - + - "#!/bin/bash" - str_replace: template: {get_file: ../../common/templates/kubernetes/fragments/write-heat-params.sh} params: @@ -582,7 +583,11 @@ resources: - name: ostree_remote_input - name: ostree_commit_input config: - get_file: ../../common/templates/kubernetes/fragments/upgrade-kubernetes.sh + list_join: + - "\n" + - + - "#!/bin/bash" + - get_file: ../../common/templates/kubernetes/fragments/upgrade-kubernetes.sh upgrade_kubernetes_deployment: type: OS::Heat::SoftwareDeployment diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml index c1515cd8e8..a2b3bff647 100644 --- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml @@ -1307,6 +1307,7 @@ resources: list_join: - "\n" - + - "#!/bin/bash" - get_file: ../../common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh - get_file: ../../common/templates/kubernetes/fragments/core-dns-service.sh - if: diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml index 129139441d..6e94b2c232 100644 --- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml +++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml @@ -717,6 +717,7 @@ resources: list_join: - "\n" - + - "#!/bin/bash" - str_replace: template: {get_file: ../../common/templates/kubernetes/fragments/write-heat-params-master.sh} params: @@ -1006,7 +1007,11 @@ resources: - name: ostree_remote_input - name: ostree_commit_input config: - get_file: ../../common/templates/kubernetes/fragments/upgrade-kubernetes.sh + list_join: + - "\n" + - + - "#!/bin/bash" + - get_file: ../../common/templates/kubernetes/fragments/upgrade-kubernetes.sh upgrade_kubernetes_deployment: type: OS::Heat::SoftwareDeployment diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubeminion.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubeminion.yaml index 80fea17d64..fca114b989 100644 --- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubeminion.yaml +++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubeminion.yaml @@ -402,6 +402,7 @@ resources: list_join: - "\n" - + - "#!/bin/bash" - str_replace: template: {get_file: ../../common/templates/kubernetes/fragments/write-heat-params.sh} params: @@ -582,7 +583,11 @@ resources: - name: ostree_remote_input - name: ostree_commit_input config: - get_file: ../../common/templates/kubernetes/fragments/upgrade-kubernetes.sh + list_join: + - "\n" + - + - "#!/bin/bash" + - get_file: ../../common/templates/kubernetes/fragments/upgrade-kubernetes.sh upgrade_kubernetes_deployment: type: OS::Heat::SoftwareDeployment