From 5e5881112d62c2089dd13b805682cfe2e9b878b5 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Thu, 7 Jul 2016 23:24:02 -0500 Subject: trying different option as delpoyment failed. Change-Id: I037057b59b2dd89f146cf65de03a2fe0053d19be Signed-off-by: Narinder Gupta --- ci/bundle_tpl/bundle.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'ci/bundle_tpl/bundle.yaml') diff --git a/ci/bundle_tpl/bundle.yaml b/ci/bundle_tpl/bundle.yaml index 713a6931..62047fba 100644 --- a/ci/bundle_tpl/bundle.yaml +++ b/ci/bundle_tpl/bundle.yaml @@ -1,9 +1,12 @@ # vim: set ts=2 et: -{{ ubuntu.release }}-{{ os.release }}: +{{ ubuntu.release }}-{{ os.release }}-nodes: inherits: openstack-phase1 overrides: {% include 'phase2-overrides.yaml' %} +{{ ubuntu.release }}-{{ os.release }}: + inherits: openstack-phase2 + openstack-phase1: services: nodes: @@ -45,12 +48,16 @@ openstack-phase1: {% if os.ha.mode == 'ha' %} {% include 'haclusters.yaml' %} {% endif %} -{% include 'subordinate.yaml' %} relations: - [ 'ntp:juju-info', 'nodes:juju-info' ] {% if os.ha.mode == 'ha' %} {% include 'harelations.yaml' %} {% endif %} -{% include 'relations.yaml' %} +openstack-phase2: + inherits: openstack-phase1 + relations: +{% include 'relations.yaml' %} + services: +{% include 'subordinate.yaml' %} -- cgit 1.2.3-korg