From 13e8c11f784dc4e274e1322dc64a0dab5c38b632 Mon Sep 17 00:00:00 2001 From: Spyros Trigazis Date: Mon, 18 Mar 2019 10:45:54 +0100 Subject: [PATCH] k8s_fedora: Add ca_key before all deployments The script [1] that writes the ca.key depends in the apiserver to be running and the script to start the apiserver [0] needs the ca.key to exist. Write the ca_key before all other scripts that depend on the apiserver. story: 2005254 task: 30051 [0] https://github.com/openstack/magnum/blob/master/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh [1] https://github.com/openstack/magnum/blob/master/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml#L843 Change-Id: If532ccc4673225eb1b7e7cab77a30950ee5ee695 Signed-off-by: Spyros Trigazis --- magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml index 81c003086b..3003ef9e67 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml @@ -839,11 +839,11 @@ resources: list_join: - "\n" - - - get_file: ../../common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh - str_replace: template: {get_file: ../../common/templates/kubernetes/fragments/enable-cert-api-manager.sh} params: "$CA_KEY": {get_param: ca_key} + - get_file: ../../common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh - get_file: ../../common/templates/kubernetes/fragments/core-dns-service.sh - get_file: ../../common/templates/kubernetes/fragments/calico-service.sh - get_file: ../../common/templates/kubernetes/fragments/flannel-service.sh