diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-02-11 01:26:26 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2017-02-11 01:26:26 -0600 |
| commit | 7b7d4454f192ef25a3ff200c156dcd840d09a91e (patch) | |
| tree | e7f53aa62d19aa0b852e1d784f8d498975faf8a4 /ci/config_tpl/juju2/bundle_tpl | |
| parent | a252191f5186f9ce77fadc3d158e1cbe4b183748 (diff) | |
modfiied for JUJU 2.1-rc1 changes.
Change-Id: I593e2bf7cf14fe87bde6d83de70ed7fff1b40d2a
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml | 14 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/subordinate.yaml | 2 |
2 files changed, 5 insertions, 11 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml index 28ad55c4..eec485eb 100644 --- a/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml @@ -4,17 +4,9 @@ {% if os.service.bindings %} bindings: shared-db: internal-api - internal: internal-api -{% if opnfv.spaces_dict.public is defined %} - public: public-api -{% if opnfv.spaces_dict.data is defined %} - admin: admin-api -{% else %} - admin: internal-api -{% endif %} -{% else %} - admin: internal-api - public: internal-api + website: internal-api +{% if os.ha.mode == 'ha' %} + cluster: internal-api {% endif %} {% endif %} options: diff --git a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml index be7ced2c..2e0f7876 100644 --- a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml @@ -30,6 +30,8 @@ {% endif %} {% if opnfv.spaces_dict.data is defined %} os-data-network: {{ opnfv.spaces_dict.data.cidr }} +{% else %} + os-data-network: {{ opnfv.spaces_dict.admin.cidr }} {% endif %} {% elif os.network.controller == 'onos' %} neutron-api-onos: |