mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-14 13:45:06 +00:00
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
This commit is contained in:
committed by
Lukasz Zajaczkowski
parent
9226cf7460
commit
7b3b24c4f5
@@ -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.
|
||||
|
@@ -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: |
|
||||
|
Reference in New Issue
Block a user