diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/ceph.yaml | 14 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml | 2 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/canal.yaml | 8 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/relations.yaml | 4 | ||||
| -rwxr-xr-x | ci/openstack.sh | 22 |
5 files changed, 27 insertions, 23 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml index 0568b38a..b8948e61 100644 --- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml @@ -33,11 +33,7 @@ ceph-osd: charm: "./{{ ubuntu.release }}/ceph-osd" {% if os.hyperconverged %} -{% if opnfv.units >= 3 %} - num_units: {{ unit_ceph_qty() }} -{% else %} num_units: {{ opnfv.units }} -{% endif %} {% else %} num_units: 3 {% endif %} @@ -57,15 +53,9 @@ {% endif %} to: {% if os.hyperconverged %} -{% if opnfv.units >= 3 %} -{% for unit_id in range(0, 3) %} - - "nodes/{{ unit_id }}" -{% endfor %} -{% else %} - {% for unit_id in range(0, opnfv.units) %} +{% for unit_id in range(0, opnfv.units) %} - "nodes/{{ unit_id }}" - {% endfor %} -{% endif %} +{% endfor %} {% else %} {% if os.ha.mode == 'ha' %} {% for unit_id in range(0, 3) %} diff --git a/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml b/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml index ef5bbe37..6d777720 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml @@ -23,6 +23,8 @@ {% if k8.network.controller == 'ovn' %} {% include 'ovn.yaml' %} +{% elif k8.network.controller == 'canal' %} +{% include 'canal.yaml' %} {% else %} {% include 'flannel.yaml' %} {% endif %} diff --git a/ci/config_tpl/juju2/bundlek8_tpl/canal.yaml b/ci/config_tpl/juju2/bundlek8_tpl/canal.yaml new file mode 100644 index 00000000..2b130652 --- /dev/null +++ b/ci/config_tpl/juju2/bundlek8_tpl/canal.yaml @@ -0,0 +1,8 @@ + + canal: + charm: "cs:~containers/canal-6" +{% if os.service.bindings %} + bindings: + "": *oam-space +{% endif %} + diff --git a/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml b/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml index 42c9e136..602fbaad 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml @@ -10,6 +10,10 @@ {% if k8.network.controller == 'ovn' %} - [ 'ovn:cni', 'kubernetes-master:cni' ] - [ 'ovn:cni', 'kubernetes-worker:cni' ] +{% elif k8.network.controller == 'canal' %} + - [ 'canal:etcd', 'etcd:db' ] + - [ 'canal:cni', 'kubernetes-master:cni' ] + - [ 'canal:cni', 'kubernetes-worker:cni' ] {% else %} - [ 'flannel:etcd', 'etcd:db' ] - [ 'flannel:cni', 'kubernetes-master:cni' ] diff --git a/ci/openstack.sh b/ci/openstack.sh index a7d91fb6..9d90db6a 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -145,22 +145,22 @@ echo_info "Creating external network with neutron" if [ "onos" == "$opnfvsdn" ]; then launch_eth - neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \ - --router:external=True + openstack network show ext-net > /dev/null 2>&1 || openstack network create \ + --external --share --enable ext-net elif [ "ocl" == "$opnfvsdn" ]; then - neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \ - --router:external=True + openstack network show ext-net > /dev/null 2>&1 || openstack network create \ + --external --share --enable ext-net else - neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \ - --router:external=True \ - --provider:network_type flat \ - --provider:physical_network physnet1 + openstack network show ext-net > /dev/null 2>&1 || openstack network create \ + --provider-network-type flat \ + --provider-physical-network physnet1 \ + --external --share --enable ext-net fi -neutron subnet-show ext-subnet > /dev/null 2>&1 || neutron subnet-create ext-net \ - --name ext-subnet --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \ - --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET +openstack subnet show ext-subnet > /dev/null 2>&1 || openstack subnet create \ + --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \ + --no-dhcp --gateway $EXTNET_GW --network ext-net --subnet-range $EXTNET_NET ext-subnet # Ocl can push packets to the fabric network in order to reach a gateway if BGP/L3VPN hasn't been configured. if [ "ocl" == "$opnfvsdn" ]; then |