diff options
Diffstat (limited to 'ci/config_tpl')
| -rw-r--r-- | ci/config_tpl/bundle_tpl/bundle.yaml | 14 | ||||
| -rw-r--r-- | ci/config_tpl/bundle_tpl/phase2-overrides.yaml | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/ci/config_tpl/bundle_tpl/bundle.yaml b/ci/config_tpl/bundle_tpl/bundle.yaml index c9700842..61710816 100644 --- a/ci/config_tpl/bundle_tpl/bundle.yaml +++ b/ci/config_tpl/bundle_tpl/bundle.yaml @@ -1,5 +1,13 @@ # 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: @@ -62,7 +70,6 @@ {% include 'haclusters.yaml' %} {% endif %} -{% include 'subordinate.yaml' %} {% if os.hyperconverged %} relations: @@ -77,4 +84,9 @@ {% include 'harelations.yaml' %} {% endif %} +openstack-phase2: + inherits: openstack-phase1 + relations: {% include 'relations.yaml' %} + services: +{% include 'subordinate.yaml' %} diff --git a/ci/config_tpl/bundle_tpl/phase2-overrides.yaml b/ci/config_tpl/bundle_tpl/phase2-overrides.yaml index a8dbd400..72de7790 100644 --- a/ci/config_tpl/bundle_tpl/phase2-overrides.yaml +++ b/ci/config_tpl/bundle_tpl/phase2-overrides.yaml @@ -21,9 +21,11 @@ {% if os.network.l2_population %} #l2-population: true {% endif %} + region: {{ os.region }} {% if ubuntu.release == 'trusty' %} #source: "cloud:{{ ubuntu.release }}-{{ os.release }}" {% endif %} + #openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" {% if ubuntu.release == 'xenial' %} {% if os.release == 'newton' %} #source: "cloud:{{ ubuntu.release }}-{{ os.release }}" |