diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/01-deploybundle.sh | 13 | ||||
| -rw-r--r-- | ci/bundle_tpl/bundle.yaml | 6 | ||||
| -rw-r--r-- | ci/bundle_tpl/harelations.yaml | 2 | ||||
| -rw-r--r-- | ci/bundle_tpl/neutron-api.yaml | 6 | ||||
| -rw-r--r-- | ci/bundle_tpl/neutron-gateway.yaml | 2 | ||||
| -rw-r--r-- | ci/bundle_tpl/neutron-ovs.yaml | 2 | ||||
| -rw-r--r-- | ci/bundle_tpl/onos.yaml | 7 | ||||
| -rw-r--r-- | ci/bundle_tpl/relations.yaml | 29 | ||||
| -rw-r--r-- | ci/bundle_tpl/subordinate.yaml | 7 |
9 files changed, 57 insertions, 17 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh index 1c3811dc..78f3cf50 100755 --- a/ci/01-deploybundle.sh +++ b/ci/01-deploybundle.sh @@ -10,6 +10,8 @@ set -ex sed -i -- "s|distro=trusty|distro=$6|g" ./fetch-charms.sh ./fetch-charms.sh $6 +osdomname='' + case "$1" in 'nonha' ) cp $4/juju-deployer/ovs-$4-nonha.yaml ./bundles.yaml @@ -144,11 +146,18 @@ case "$6" in ;; esac -var=os-$4-$fea-$1 -if [ "$4" == "nosdn" ]; then +if [ "$osdomname" != "''" ]; then + var=os-$4-$fea-$1-publicapi +else + var=os-$4-$fea-$1 +fi + +if [ "$4" != "nosdn" ]; then python genBundle.py -l deployconfig.yaml -s $var > bundles.yaml elif [ "$4" == "odl" ]; then python genBundle.py -l deployconfig.yaml -s $var > bundles.yaml +elif [ "$4" == "onos" ]; then + python genBundle.py -l deployconfig.yaml -s $var > bundles.yaml fi echo "... Deployment Started ...." diff --git a/ci/bundle_tpl/bundle.yaml b/ci/bundle_tpl/bundle.yaml index 19bf115c..4aae4fb0 100644 --- a/ci/bundle_tpl/bundle.yaml +++ b/ci/bundle_tpl/bundle.yaml @@ -33,7 +33,11 @@ openstack-phase1: {% include 'heat.yaml' %} {% include 'neutron-api.yaml' %} {% include 'neutron-gateway.yaml' %} -{% if os.network.controller == 'odl' %}{% include 'odl.yaml' %}{% endif %} +{% if os.network.controller == 'odl' %} + {% include 'odl.yaml' %} +{% elif os.network.controller == 'onos' %} + {% include 'onos.yaml' %} +{% endif %} {% if os.ha.mode == 'ha' %} {% include 'haclusters.yaml' %} {% endif %} diff --git a/ci/bundle_tpl/harelations.yaml b/ci/bundle_tpl/harelations.yaml index 0a455e98..bc089d0c 100644 --- a/ci/bundle_tpl/harelations.yaml +++ b/ci/bundle_tpl/harelations.yaml @@ -18,6 +18,8 @@ - hacluster-horizon:ha - - heat:ha - hacluster-heat:ha + - - ceilometer:ha + - hacluster-ceilometer:ha {% if os.beta.hacluster_ceph_radosgw %} - - ceph-radosgw:ha - hacluster-ceph-radosgw:ha diff --git a/ci/bundle_tpl/neutron-api.yaml b/ci/bundle_tpl/neutron-api.yaml index 3942fe23..86c6fedf 100644 --- a/ci/bundle_tpl/neutron-api.yaml +++ b/ci/bundle_tpl/neutron-api.yaml @@ -5,8 +5,10 @@ neutron-security-groups: true {% if os.network.controller == 'nosdn' %} overlay-network-type: vxlan -{% endif %} -{% if os.network.controller == 'odl' %} +{% elif os.network.controller == 'odl' %} + manage-neutron-plugin-legacy-mode: False +{% elif os.network.controller == 'onos' %} + flat-network-providers: "*" manage-neutron-plugin-legacy-mode: False {% endif %} {% if os.ha.mode == 'ha' %} diff --git a/ci/bundle_tpl/neutron-gateway.yaml b/ci/bundle_tpl/neutron-gateway.yaml index f1eadc3c..c5678a0f 100644 --- a/ci/bundle_tpl/neutron-gateway.yaml +++ b/ci/bundle_tpl/neutron-gateway.yaml @@ -6,6 +6,8 @@ {% endif %} {% if os.network.controller == 'odl' %} plugin: ovs-odl +{% elif os.network.controller == 'onos' %} + plugin: onos {% endif %} instance-mtu: 1400 to: diff --git a/ci/bundle_tpl/neutron-ovs.yaml b/ci/bundle_tpl/neutron-ovs.yaml index ba0b6a5b..20bf1d9b 100644 --- a/ci/bundle_tpl/neutron-ovs.yaml +++ b/ci/bundle_tpl/neutron-ovs.yaml @@ -4,8 +4,8 @@ {% if os.network.dpdk %} enable-dpdk: true #dpdk-driver: uio_pci_generic -{% endif %} #data-port: "" #default-socket-memory: 1024 #default-socket-cores: 1 +{% endif %} {# Empty block to avoid bad block trim #} diff --git a/ci/bundle_tpl/onos.yaml b/ci/bundle_tpl/onos.yaml new file mode 100644 index 00000000..4459330f --- /dev/null +++ b/ci/bundle_tpl/onos.yaml @@ -0,0 +1,7 @@ + onos-controller: + charm: local:{{ ubuntu.release }}/onos-controller + options: + #ext-port: "eth1" + #gateway-mac: "default" + to: + - "lxc:nodes=0" diff --git a/ci/bundle_tpl/relations.yaml b/ci/bundle_tpl/relations.yaml index 98b3d317..c2e12a98 100644 --- a/ci/bundle_tpl/relations.yaml +++ b/ci/bundle_tpl/relations.yaml @@ -100,12 +100,25 @@ - - neutron-openvswitch:neutron-plugin-api - neutron-api:neutron-plugin-api {% elif os.network.controller == 'odl' %} - - - nova-compute:neutron-plugin - - openvswitch-odl:neutron-plugin - - - neutron-gateway - - openvswitch-odl - - - openvswitch-odl:ovsdb-manager - - odl-controller:ovsdb-manager - - - neutron-api-odl:odl-controller - - odl-controller:controller-api + - - "neutron-api:neutron-plugin-api-subordinate" + - "neutron-api-odl:neutron-plugin-api-subordinate" + - - "nova-compute:neutron-plugin" + - "openvswitch-odl:neutron-plugin" + - - "neutron-gateway" + - "openvswitch-odl" + - - "openvswitch-odl:ovsdb-manager" + - "odl-controller:ovsdb-manager" + - - "neutron-api-odl:odl-controller" + - "odl-controller:controller-api" +{% elif os.network.controller == 'onos' %} + - - "neutron-api:neutron-plugin-api-subordinate" + - "neutron-api-onos:neutron-plugin-api-subordinate" + - - "nova-compute:neutron-plugin" + - "openvswitch-onos:neutron-plugin" + - - "neutron-gateway" + - "openvswitch-onos" + - - "openvswitch-onos:ovsdb-manager" + - "onos-controller:ovsdb-manager" + - - "neutron-api-onos:onos-controller" + - "onos-controller:controller-api" {% endif %} diff --git a/ci/bundle_tpl/subordinate.yaml b/ci/bundle_tpl/subordinate.yaml index c84cdd72..645cd057 100644 --- a/ci/bundle_tpl/subordinate.yaml +++ b/ci/bundle_tpl/subordinate.yaml @@ -4,7 +4,8 @@ cinder-ceph: charm: local:{{ ubuntu.release }}/cinder-ceph {% endif %} -{% if os.network.controller == 'nosdn' %}{% include 'neutron-ovs.yaml' %} +{% if os.network.controller == 'nosdn' %} + {% include 'neutron-ovs.yaml' %} {% elif os.network.controller == 'odl' %} neutron-api-odl: charm: local:{{ ubuntu.release }}/neutron-api-odl @@ -14,13 +15,13 @@ openvswitch-odl: charm: local:{{ ubuntu.release }}/openvswitch-odl {% elif os.network.controller == 'nons' %} - openvswitch-onos: - charm: local:{{ ubuntu.release }}/openvswitch-onos neutron-api-onos: charm: local:{{ ubuntu.release }}/neutron-api-onos options: overlay-network-type: 'vxlan' security-groups: True + openvswitch-onos: + charm: local:{{ ubuntu.release }}/openvswitch-onos {% endif %} {% if os.lxd %} lxd: |