diff options
Diffstat (limited to 'ci/bundle_tpl/bundle.yaml')
| -rw-r--r-- | ci/bundle_tpl/bundle.yaml | 13 |
1 files changed, 10 insertions, 3 deletions
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' %} |