diff options
Diffstat (limited to 'ci/bundle_tpl/bundle.yaml')
| -rw-r--r-- | ci/bundle_tpl/bundle.yaml | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/ci/bundle_tpl/bundle.yaml b/ci/bundle_tpl/bundle.yaml index 62047fba..713a6931 100644 --- a/ci/bundle_tpl/bundle.yaml +++ b/ci/bundle_tpl/bundle.yaml @@ -1,12 +1,9 @@ # vim: set ts=2 et: -{{ ubuntu.release }}-{{ os.release }}-nodes: +{{ ubuntu.release }}-{{ os.release }}: inherits: openstack-phase1 overrides: {% include 'phase2-overrides.yaml' %} -{{ ubuntu.release }}-{{ os.release }}: - inherits: openstack-phase2 - openstack-phase1: services: nodes: @@ -48,16 +45,12 @@ 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 %} - -openstack-phase2: - inherits: openstack-phase1 - relations: {% include 'relations.yaml' %} - services: -{% include 'subordinate.yaml' %} + |