diff options
Diffstat (limited to 'ci/config_tpl')
-rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml | 1 | ||||
-rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/ceph.yaml | 5 | ||||
-rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/cinder.yaml | 1 | ||||
-rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/glance.yaml | 1 | ||||
-rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml | 2 | ||||
-rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml | 1 | ||||
-rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/spaces.yaml | 32 | ||||
-rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml | 2 | ||||
-rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml | 2 | ||||
-rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml | 2 | ||||
-rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/flannel.yaml | 4 | ||||
-rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml | 4 | ||||
-rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml | 5 | ||||
-rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/spaces.yaml | 5 |
14 files changed, 43 insertions, 24 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml index b34bec24..de6a1214 100644 --- a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml @@ -1,6 +1,7 @@ mongodb: charm: ./{{ ubuntu.release }}/mongodb num_units: 1 + constraints: *oam-space-constr {% if os.service.bindings %} bindings: "": *internal-space diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml index 87591a42..cdbe4869 100644 --- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml @@ -28,8 +28,8 @@ {% endfor %} {% else %} - "lxd:nodes/0" - - "lxd:nodes/1" - - "lxd:nodes/2" + - "lxd:nodes/0" + - "lxd:nodes/0" {% endif %} {% endif %} ceph-osd: @@ -83,6 +83,7 @@ charm: "./{{ ubuntu.release }}/ceph-radosgw" num_units: {{ unit_qty() if os.beta.hacluster_ceph_radosgw else 1 }} {% if os.service.bindings %} + constraints: *ceph-access-constr bindings: "": *oam-space public: *public-space diff --git a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml index 027fc045..0313f07c 100644 --- a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml @@ -6,6 +6,7 @@ num_units: {{ unit_qty() }} {% endif %} {% if os.service.bindings %} + constraints: *ceph-access-constr bindings: "": *oam-space public: *public-space diff --git a/ci/config_tpl/juju2/bundle_tpl/glance.yaml b/ci/config_tpl/juju2/bundle_tpl/glance.yaml index 198cefb7..725c436e 100644 --- a/ci/config_tpl/juju2/bundle_tpl/glance.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/glance.yaml @@ -2,6 +2,7 @@ charm: "./{{ ubuntu.release }}/glance" num_units: {{ unit_qty() }} {% if os.service.bindings %} + constraints: *ceph-access-constr bindings: "": *oam-space public: *public-space 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/openstack-dashboard.yaml b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml index 5e240e24..9132096e 100644 --- a/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml @@ -2,6 +2,7 @@ charm: "./{{ ubuntu.release }}/openstack-dashboard" num_units: {{ unit_qty() }} {% if os.service.bindings %} + constraints: *oam-space-constr bindings: "": *public-space shared-db: *internal-space 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 %} diff --git a/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml b/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml index 96a27cfb..b4ed14ac 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml @@ -6,6 +6,8 @@ # deployment before moving to production. # series: {{ ubuntu.release }} + variables: +{% include 'spaces.yaml' %} services: nodes: charm: "cs:{{ ubuntu.release }}/ubuntu" diff --git a/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml b/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml index ea46e424..87802a0e 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml @@ -3,7 +3,7 @@ num_units: 1 {% if os.service.bindings %} bindings: - "": internal-api + "": *oam-space {% endif %} to: {% if k8.network.controller == 'ovn' %} diff --git a/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml b/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml index d902adf8..0908e3a1 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml @@ -11,7 +11,7 @@ {% endif %} {% if os.service.bindings %} bindings: - "": internal-api + "": *oam-space {% endif %} to: {% if k8.network.controller == 'ovn' %} diff --git a/ci/config_tpl/juju2/bundlek8_tpl/flannel.yaml b/ci/config_tpl/juju2/bundlek8_tpl/flannel.yaml index 561e0880..79b89c7f 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/flannel.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/flannel.yaml @@ -3,5 +3,5 @@ charm: cs:~containers/flannel {% if os.service.bindings %} bindings: - "": internal-api -{% endif %}
\ No newline at end of file + "": *oam-space +{% endif %} diff --git a/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml b/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml index 933c1ef7..645ab157 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml @@ -4,7 +4,7 @@ expose: true {% if os.service.bindings %} bindings: - "": internal-api + "": *oam-space {% endif %} {% if k8.network.controller == 'ovn' %} options: @@ -23,7 +23,7 @@ expose: true {% if os.service.bindings %} bindings: - "": internal-api + "": *oam-space {% endif %} {% if k8.network.controller == 'ovn' %} options: diff --git a/ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml b/ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml index 978c07c9..98def5ae 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml @@ -3,7 +3,8 @@ charm: "cs:~aakashkt/ovn-15" {% if os.service.bindings %} bindings: - "": internal-api + "": *oam-space {% endif %} options: - gateway-physical-interface: "none"
\ No newline at end of file + gateway-physical-interface: "none" + diff --git a/ci/config_tpl/juju2/bundlek8_tpl/spaces.yaml b/ci/config_tpl/juju2/bundlek8_tpl/spaces.yaml new file mode 100644 index 00000000..17dbd7da --- /dev/null +++ b/ci/config_tpl/juju2/bundlek8_tpl/spaces.yaml @@ -0,0 +1,5 @@ + + + # OAM - Operations, Administration and Maintenance + oam-space: &oam-space internal-api + |