Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
cloud
charms
kubernetes-keystone
Commits
7121811e
Commit
7121811e
authored
Jul 13, 2018
by
Giuseppe Attardi
Browse files
server.crt instead of apiserver.crt
parent
f0466be0
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
.build.manifest
View file @
7121811e
This diff is collapsed.
Click to expand it.
.gitignore
View file @
7121811e
*~
*.pyc
/builds/
reactive/kubernetes-keystone.py
View file @
7121811e
...
...
@@ -77,12 +77,13 @@ def setup_authentication():
k8s_keystone_auth_url
=
hookenv
.
config
(
'k8s-keystone-auth-url'
)
hookenv
.
log
(
'Downloading %s'
%
k8s_keystone_auth_url
)
handler
.
download
(
k8s_keystone_auth_url
,
k8s_keystone_auth_path
)
check_call
([
'chmod'
,
'+x'
,
k8s_keystone_auth_path
])
# CHECKME: do we need authorization-mode Webhook?
# get current value for authorization-mode
cmd
=
[
'snap'
,
'get'
,
'kube-apiserver'
,
'authorization-mode'
]
auth_mode
=
check_output
(
cmd
)
auth_mode
=
check_output
(
cmd
)
.
decode
(
'utf-8'
)
if
'Webhook'
not
in
auth_mode
:
if
auth_mode
:
auth_mode
+=
','
auth_mode
+=
'Webhook'
...
...
templates/k8s-keystone-auth.sh
View file @
7121811e
...
...
@@ -3,8 +3,8 @@ set -a
K8S_KEYSTONE_AUTH
={{
k8s_keystone_auth_path
}}
KEYSTONE_URL
={{
keystone_url
}}
APISERVER_CERT
=
/root/cdk/
api
server.crt
APISERVER_KEY
=
/root/cdk/
api
server.key
APISERVER_CERT
=
/root/cdk/server.crt
APISERVER_KEY
=
/root/cdk/server.key
SYNC_CONFIG
=
/root/cdk/sync-config.yaml
KUBE_CONFIG
=
/home/ubuntu/config
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment