diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-08-15 08:41:55 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-08-15 09:18:31 -0500 |
| commit | b4c1448a8548b75de14915110abc4a0be292482a (patch) | |
| tree | 0dd882337ccbbb7ab72fe1f418eb49f4275ffa3a /ci/config_tpl/bundle_tpl/bundle.yaml | |
| parent | 86c767d5c762fc1555f54a7a9ec9029617c6950e (diff) | |
added option to choose the architecture of hyperconverged ot not.
Change-Id: If5d83b221ce1481014f2e76816a7fe568e656904
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/bundle_tpl/bundle.yaml')
| -rw-r--r-- | ci/config_tpl/bundle_tpl/bundle.yaml | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/ci/config_tpl/bundle_tpl/bundle.yaml b/ci/config_tpl/bundle_tpl/bundle.yaml index 8c08c1a2..a5aa5578 100644 --- a/ci/config_tpl/bundle_tpl/bundle.yaml +++ b/ci/config_tpl/bundle_tpl/bundle.yaml @@ -9,9 +9,27 @@ openstack-phase1: services: +{% if os.hyperconverged %} nodes: charm: "cs:{{ ubuntu.release }}/ubuntu" num_units: {{ opnfv.units }} +{% else %} + nodes: + charm: "cs:{{ ubuntu.release }}/ubuntu" +{% if os.ha.mode == 'ha' %} + num_units: 3 +{% else %} + num_units: 1 +{% endif %} + constraints: tags=control + nodes-compute: + charm: "cs:{{ ubuntu.release }}/ubuntu" +{% if os.ha.mode == 'ha' %} + num_units: {{ opnfv.units - 3 }} +{% else %} + num_units: {{ opnfv.units - 1 }} +{% endif %} +{% endif %} ntp: charm: "local:{{ ubuntu.release }}/ntp" {% if os.network.controller == 'ocl' %} @@ -46,8 +64,14 @@ openstack-phase1: {% include 'haclusters.yaml' %} {% endif %} +{% if os.hyperconverged %} relations: - [ 'ntp:juju-info', 'nodes:juju-info' ] +{% else %} + relations: + - [ 'ntp:juju-info', 'nodes:juju-info' ] + - [ 'ntp:juju-info', 'nodes-compute:juju-info' ] +{% endif %} {% if os.ha.mode == 'ha' %} {% include 'harelations.yaml' %} {% endif %} |