From 7b3b24c4f5975f6919fbdcba756bfaa40b703665 Mon Sep 17 00:00:00 2001 From: Elson O Rodriguez Date: Sat, 23 Apr 2016 18:08:45 -0700 Subject: [PATCH] Triages #7 for OpenStack provider, still needs work. Fixed the order of fields for basic_auth. This provider still needs to leverage common.sh for generating proper credentials though. Also documented a pattern for how to get the SWIFT_SERVER_URL automatically --- cluster/openstack-heat/config-default.sh | 1 + .../fragments/deploy-kube-auth-files-master.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cluster/openstack-heat/config-default.sh b/cluster/openstack-heat/config-default.sh index 643fb5e0a49..480e6f43059 100644 --- a/cluster/openstack-heat/config-default.sh +++ b/cluster/openstack-heat/config-default.sh @@ -35,6 +35,7 @@ MINION_FLAVOR=${MINION_FLAVOR:-m1.medium} EXTERNAL_NETWORK=${EXTERNAL_NETWORK:-public} +#FIXME This can get set by evaulating the output of `swift auth` and stripping the base URL from OS_STORAGE_URL, but will require a refactor. Till then... SWIFT_SERVER_URL=${SWIFT_SERVER_URL:-http://192.168.123.100:8080} # Flag indicates if new image must be created. If 'false' then image with IMAGE_ID will be used. diff --git a/cluster/openstack-heat/kubernetes-heat/fragments/deploy-kube-auth-files-master.yaml b/cluster/openstack-heat/kubernetes-heat/fragments/deploy-kube-auth-files-master.yaml index 10ba9ae8861..a7912927642 100644 --- a/cluster/openstack-heat/kubernetes-heat/fragments/deploy-kube-auth-files-master.yaml +++ b/cluster/openstack-heat/kubernetes-heat/fragments/deploy-kube-auth-files-master.yaml @@ -7,7 +7,7 @@ write_files: - path: /srv/salt-overlay/salt/kube-apiserver/basic_auth.csv permissions: "0600" content: | - $apiserver_user,$apiserver_password,admin + $apiserver_password,$apiserver_user,admin - path: /srv/salt-overlay/salt/kube-apiserver/known_tokens.csv permissions: "0600" content: |