summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Velten <mathieu.velten@cern.ch>2017-02-21 18:09:36 +0100
committerSpyros Trigazis <strigazi@gmail.com>2017-02-26 08:18:43 +0000
commit1e07c37d1fbd89488ed89e52155dd95698a65f1e (patch)
tree74c1bf8d0bf9d599a496bb5fc357229eba071abe
parent07480298c29b89ced64f367f4853f9b27f3554cf (diff)
Missing root-ca-file parameter for proper service account support
Notes
Notes (review): Code-Review+2: yatin <yatin.karel@nectechnologies.in> Code-Review+2: Spyros Trigazis <strigazi@gmail.com> Workflow+1: Spyros Trigazis <strigazi@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 27 Feb 2017 10:31:12 +0000 Reviewed-on: https://review.openstack.org/436559 Project: openstack/magnum Branch: refs/heads/stable/ocata
-rw-r--r--magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh2
1 files changed, 1 insertions, 1 deletions
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 0b6fd77..2406ad1 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
@@ -47,7 +47,7 @@ _EOC_
47# Add controller manager args 47# Add controller manager args
48KUBE_CONTROLLER_MANAGER_ARGS="" 48KUBE_CONTROLLER_MANAGER_ARGS=""
49if [ -n "${ADMISSION_CONTROL_LIST}" ] && [ "${TLS_DISABLED}" == "False" ]; then 49if [ -n "${ADMISSION_CONTROL_LIST}" ] && [ "${TLS_DISABLED}" == "False" ]; then
50 KUBE_CONTROLLER_MANAGER_ARGS="--service-account-private-key-file=/srv/kubernetes/server.key" 50 KUBE_CONTROLLER_MANAGER_ARGS="--service-account-private-key-file=/srv/kubernetes/server.key --root-ca-file=/srv/kubernetes/ca.crt"
51fi 51fi
52sed -i ' 52sed -i '
53 /^KUBELET_ADDRESSES=/ s/=.*/="--machines='""'"/ 53 /^KUBELET_ADDRESSES=/ s/=.*/="--machines='""'"/