Commit 7121811e authored by Giuseppe Attardi's avatar Giuseppe Attardi
Browse files

server.crt instead of apiserver.crt

parent f0466be0
This diff is collapsed.
......@@ -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'
......
......@@ -3,8 +3,8 @@ set -a
K8S_KEYSTONE_AUTH={{ k8s_keystone_auth_path }}
KEYSTONE_URL={{ keystone_url }}
APISERVER_CERT=/root/cdk/apiserver.crt
APISERVER_KEY=/root/cdk/apiserver.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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment