diff options
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl/spaces.yaml')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/spaces.yaml | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/spaces.yaml b/ci/config_tpl/juju2/bundle_tpl/spaces.yaml index 63f624f3..3023dfc0 100644 --- a/ci/config_tpl/juju2/bundle_tpl/spaces.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/spaces.yaml @@ -1,34 +1,35 @@ - - {% if os.release == 'mitaka' %} openstack-origin: &openstack-origin distro {% else %} openstack-origin: &openstack-origin cloud:{{ ubuntu.release }}-{{ os.release }} {% endif %} - openstack-region: &openstack-region {{ os.region }} worker-multiplier: &worker-multiplier {{ os.api.worker_multiplier }} data-port: &data-port br-data:{{ opnfv.ext_port }} # OAM - Operations, Administration and Maintenance -{% if opnfv.spaces_dict.pxe is defined %} - oam-space: &oam-space oam-space -{% else %} oam-space: &oam-space internal-api -{% endif %} + # This is OpenStack Internal network; for internalURL endpoints # This is OpenStack Admin network; for adminURL endpoints +{% if opnfv.spaces_dict.osapi is defined %} + internal-space: &internal-space os-api + admin-space: &admin-space os-api +{% else %} + internal-space: &internal-space internal-api admin-space: &admin-space internal-api +{% endif %} # This is OpenStack Public network; for publicURL endpoints {% if opnfv.spaces_dict.public is defined %} public-space: &public-space public-api {% else %} +{% if opnfv.spaces_dict.osapi is defined %} + public-space: &public-space os-api +{% else %} public-space: &public-space internal-api {% endif %} - - # This is OpenStack Internal network; for internalURL endpoints - internal-space: &internal-space internal-api +{% endif %} # This is the overlay network {% if opnfv.spaces_dict.data is defined %} @@ -39,7 +40,13 @@ # CEPH configuration # CEPH access network - ceph-public-space: &ceph-public-space internal-api +{% if opnfv.spaces_dict.storageaccess is defined %} + ceph-public-space: &ceph-public-space storage-access-space + ceph-access-constr: &ceph-access-constr spaces=storage-access-space +{% else %} + ceph-public-space: &ceph-public-space internal-api + ceph-access-constr: &ceph-access-constr spaces=internal-api +{% endif %} # CEPH replication network {% if opnfv.spaces_dict.storage is defined %} @@ -49,8 +56,7 @@ {% endif %} # Workaround for 'only one default binding supported' - oam-space-constr: &oam-space-constr spaces=oam-space - ceph-access-constr: &ceph-access-constr spaces=ceph-access-space + oam-space-constr: &oam-space-constr spaces=internal-api # CEPH OSD and journal devices; temporary workaround for #1674148 {% if os.lxd %} |