diff options
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml | 2 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/spaces.yaml | 19 |
2 files changed, 13 insertions, 8 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml b/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml index 588eeb2b..e27b0d48 100644 --- a/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml @@ -105,7 +105,7 @@ charm: ./{{ ubuntu.release }}/contrail-keystone-auth num_units: 1 bindings: - "": internal-api + "": *oam-space to: - "lxd:nodes/0" diff --git a/ci/config_tpl/juju2/bundle_tpl/spaces.yaml b/ci/config_tpl/juju2/bundle_tpl/spaces.yaml index 63f624f3..73096ef5 100644 --- a/ci/config_tpl/juju2/bundle_tpl/spaces.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/spaces.yaml @@ -11,24 +11,29 @@ 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 %} |