From f6fe86e2826eba53302cb6575796df2cba3cc8ee Mon Sep 17 00:00:00 2001 From: David Ames Date: Mon, 5 Nov 2018 14:54:13 -0800 Subject: [PATCH] Allow OSCI environment variables Zaza explicitly limits which environment variables are allowed for template rendering. Allow the variables that OSCI actually uses. Without this OSCI fails to render vips. This enables zaza tests with HA in OSCI. --- unit_tests/test_zaza_charm_lifecycle_deploy.py | 5 +++-- zaza/charm_lifecycle/deploy.py | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/unit_tests/test_zaza_charm_lifecycle_deploy.py b/unit_tests/test_zaza_charm_lifecycle_deploy.py index 3e53469..4f38dd8 100644 --- a/unit_tests/test_zaza_charm_lifecycle_deploy.py +++ b/unit_tests/test_zaza_charm_lifecycle_deploy.py @@ -28,7 +28,7 @@ class TestCharmLifecycleDeploy(ut_utils.BaseTestCase): self.assertTrue(lc_deploy.is_valid_env_key('NAME_SERVER')) self.assertTrue(lc_deploy.is_valid_env_key('NET_ID')) self.assertTrue(lc_deploy.is_valid_env_key('VIP_RANGE')) - self.assertFalse(lc_deploy.is_valid_env_key('AMULET_OS_VIP')) + self.assertTrue(lc_deploy.is_valid_env_key('AMULET_OS_VIP')) self.assertFalse(lc_deploy.is_valid_env_key('ZAZA_TEMPLATE_VIP00')) self.assertFalse(lc_deploy.is_valid_env_key('PATH')) @@ -41,7 +41,8 @@ class TestCharmLifecycleDeploy(ut_utils.BaseTestCase): ('PATH', 'aa')] self.assertEqual( lc_deploy.get_template_context_from_env(), - {'OS_VIP04': '10.10.0.2'} + {'OS_VIP04': '10.10.0.2', + 'AMULET_OS_VIP': '10.10.0.2'} ) def test_get_charm_config_context(self): diff --git a/zaza/charm_lifecycle/deploy.py b/zaza/charm_lifecycle/deploy.py index 9047a20..da04a00 100755 --- a/zaza/charm_lifecycle/deploy.py +++ b/zaza/charm_lifecycle/deploy.py @@ -32,6 +32,8 @@ VALID_ENVIRONMENT_KEY_PREFIXES = [ 'NET_ID', 'OS_', 'VIP_RANGE', + 'AMULET_', + 'MOJO_', ] LOCAL_OVERLAY_TEMPLATE = """ applications: