From 3e73a00957272b59d8ad4a2b3a6de95e0947c426 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Fri, 26 Jun 2015 02:27:32 +0000 Subject: [PATCH] resync tests/charmhelpers re: subordinate origin ignore list --- Makefile | 2 +- charm-helpers-tests.yaml | 3 ++- tests/charmhelpers/contrib/openstack/amulet/deployment.py | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d7444d9..2371075 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ bin/charm_helpers_sync.py: > bin/charm_helpers_sync.py sync: bin/charm_helpers_sync.py - @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml +# @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml publish: lint unit_test diff --git a/charm-helpers-tests.yaml b/charm-helpers-tests.yaml index 48b12f6..987d84c 100644 --- a/charm-helpers-tests.yaml +++ b/charm-helpers-tests.yaml @@ -1,4 +1,5 @@ -branch: lp:charm-helpers +#branch: lp:charm-helpers +branch: lp:~1chb1n/charm-helpers/amulet-ceph-cinder-updates/ destination: tests/charmhelpers include: - contrib.amulet diff --git a/tests/charmhelpers/contrib/openstack/amulet/deployment.py b/tests/charmhelpers/contrib/openstack/amulet/deployment.py index 84850bd..a37a4aa 100644 --- a/tests/charmhelpers/contrib/openstack/amulet/deployment.py +++ b/tests/charmhelpers/contrib/openstack/amulet/deployment.py @@ -79,9 +79,9 @@ class OpenStackAmuletDeployment(AmuletDeployment): services.append(this_service) use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph', 'ceph-osd', 'ceph-radosgw'] - # Openstack subordinate charms do not expose an origin option as that - # is controlled by the principle - ignore = ['neutron-openvswitch'] + # Most OpenStack subordinate charms do not expose an origin option + # as that is controlled by the principle. + ignore = ['cinder-ceph', 'hacluster', 'neutron-openvswitch'] if self.openstack: for svc in services: