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

Triages #7 for OpenStack provider, still needs work.
7b3b24c4 · Elson O Rodriguez · Lukasz Zajaczkowski · 9226cf74 · 7b3b24c4 · 7b3b24c4
Commit 7b3b24c4 authored Apr 23, 2016 by Elson O Rodriguez Committed by Lukasz Zajaczkowski Apr 28, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

config-default.sh cluster/openstack-heat/config-default.sh +1 -0

deploy-kube-auth-files-master.yaml ...ernetes-heat/fragments/deploy-kube-auth-files-master.yaml +1 -1

No files found.
--- 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.

--- 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: |