From 20c36e9c9349eb8ae97e634e931465c159719a14 Mon Sep 17 00:00:00 2001 From: Rye Terrell Date: Wed, 19 Apr 2017 14:24:14 -0500 Subject: [PATCH] prevent installation of docker from upstream --- cluster/juju/layers/kubernetes-worker/layer.yaml | 3 +++ .../layers/kubernetes-worker/reactive/kubernetes_worker.py | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cluster/juju/layers/kubernetes-worker/layer.yaml b/cluster/juju/layers/kubernetes-worker/layer.yaml index 014fec02bac..d2ae0e3d61d 100644 --- a/cluster/juju/layers/kubernetes-worker/layer.yaml +++ b/cluster/juju/layers/kubernetes-worker/layer.yaml @@ -12,6 +12,9 @@ includes: - 'interface:kubernetes-cni' - 'interface:kube-dns' - 'interface:kube-control' +config: + deletes: + - install_from_upstream options: basic: packages: diff --git a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py index c887dc23421..e248dd9967e 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -38,7 +38,6 @@ from charmhelpers.core import hookenv, unitdata from charmhelpers.core.host import service_stop, service_restart from charmhelpers.contrib.charmsupport import nrpe - # Override the default nagios shortname regex to allow periods, which we # need because our bin names contain them (e.g. 'snap.foo.daemon'). The # default regex in charmhelpers doesn't allow periods, but nagios itself does. @@ -53,6 +52,10 @@ db = unitdata.kv() @hook('upgrade-charm') def upgrade_charm(): + # Trigger removal of PPA docker installation if it was previously set. + set_state('config.changed.install_from_upstream') + hookenv.atexit(remove_state, 'config.changed.install_from_upstream') + cleanup_pre_snap_services() check_resources_for_upgrade_needed()