github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure daemon opts are in effect before docker login

Browse Source
This commit is contained in:
Kevin W Monroe
2018-02-06 05:16:20 +00:00
parent d3b783d5ec
commit 4af548bb5a
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View File

@@ -451,8 +451,17 @@ def extra_args_changed():
@when('config.changed.docker-logins') @when('config.changed.docker-logins')
@when_not('docker.restart')
def docker_logins_changed(): def docker_logins_changed():
"""Login to a docker registry with configured credentials."""
config = hookenv.config() config = hookenv.config()
if data_changed('docker-opts', config['docker-opts']):
hookenv.log('Skipping docker login until daemon is restarted.')
# State will be removed by layer-docker after restart
set_state('docker.restart')
return
previous_logins = config.previous('docker-logins') previous_logins = config.previous('docker-logins')
logins = config['docker-logins'] logins = config['docker-logins']
logins = json.loads(logins) logins = json.loads(logins)