summaryrefslogtreecommitdiffstats
path: root/ci/config_tpl/bundle_tpl
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-10-07 23:42:57 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-10-07 23:43:33 -0500
commitd2d6923d759fbed5ad5147c95f9cb9f9051c8b11 (patch)
tree325265fd5abc6c4c04d6db49aa8ea76439ddb57b /ci/config_tpl/bundle_tpl
parentc262781dca8f2459e0e29ae1a88833ef41e4ed21 (diff)
remove phase bundle to single bundle and test.
Change-Id: I2d04ea10f34d0bd578a635c63f27aae361293e18 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/bundle_tpl')
-rw-r--r--ci/config_tpl/bundle_tpl/bundle.yaml15
1 files changed, 1 insertions, 14 deletions
diff --git a/ci/config_tpl/bundle_tpl/bundle.yaml b/ci/config_tpl/bundle_tpl/bundle.yaml
index 02733da3..9e171b8f 100644
--- a/ci/config_tpl/bundle_tpl/bundle.yaml
+++ b/ci/config_tpl/bundle_tpl/bundle.yaml
@@ -1,13 +1,5 @@
# vim: set ts=2 et:
-{{ ubuntu.release }}-{{ os.release }}-nodes:
- inherits: openstack-phase1
- #overrides:
-{% include 'phase2-overrides.yaml' %}
-
{{ ubuntu.release }}-{{ os.release }}:
- inherits: openstack-phase2
-
-openstack-phase1:
services:
{% if os.hyperconverged %}
nodes:
@@ -69,6 +61,7 @@ openstack-phase1:
{% if os.ha.mode == 'ha' %}
{% include 'haclusters.yaml' %}
{% endif %}
+{% include 'subordinate.yaml' %}
{% if os.hyperconverged %}
relations:
@@ -81,10 +74,4 @@ openstack-phase1:
{% if os.ha.mode == 'ha' %}
{% include 'harelations.yaml' %}
{% endif %}
-
-openstack-phase2:
- inherits: openstack-phase1
- relations:
{% include 'relations.yaml' %}
- services:
-{% include 'subordinate.yaml' %}