Revert "Bug 49 : Update vpr-router charm to support workload state"
This commit includes the compiled charm. It should only include the source of the charm layer. Build artifacts can be published in and deployed from jujucharms.com
This reverts commit ac6caf736057309b4f843f06f14cfe7eaa143e18.
Change-Id: I25df517a02a9213d6876250da6be3afd859a9400
Signed-off-by: Adam Israel <adam.israel@canonical.com>
diff --git a/vpe-router/reactive/__init__.py b/vpe-router/reactive/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/vpe-router/reactive/__init__.py
+++ /dev/null
diff --git a/vpe-router/reactive/vpe_router.py b/vpe-router/reactive/vpe_router.py
index de1e024..c62983d 100644
--- a/vpe-router/reactive/vpe_router.py
+++ b/vpe-router/reactive/vpe_router.py
@@ -8,6 +8,7 @@
)
from charms.reactive import (
+ hook,
when,
when_not,
helpers,
@@ -21,15 +22,13 @@
cfg = config()
-@when('config.changed')
+@hook('config-changed')
def validate_config():
try:
"""
If the ssh credentials are available, we'll act as a proxy charm.
Otherwise, we execute against the unit we're deployed on to.
"""
- status_set('maintenance', 'configuring ssh connection')
- remove_state('vpe.configured')
if all(k in cfg for k in ['pass', 'vpe-router', 'user']):
routerip = cfg['vpe-router']
user = cfg['user']
@@ -63,8 +62,8 @@
(' '.join(e.cmd), str(e.output)))
raise
- set_state('vpe.configured')
- status_set('active', 'ready!')
+ set_state('vpe.configured')
+ status_set('active', 'ready!')
except Exception as e:
log(repr(e))