diff options
| -rw-r--r-- | ci/bundle_tpl/ceph.yaml | 4 | ||||
| -rw-r--r-- | ci/bundle_tpl/neutron-gateway.yaml | 12 | ||||
| -rw-r--r-- | ci/bundle_tpl/neutron-ovs.yaml | 2 | ||||
| -rwxr-xr-x | ci/openstack.sh | 18 |
4 files changed, 29 insertions, 7 deletions
diff --git a/ci/bundle_tpl/ceph.yaml b/ci/bundle_tpl/ceph.yaml index 01d62ca7..82cfd283 100644 --- a/ci/bundle_tpl/ceph.yaml +++ b/ci/bundle_tpl/ceph.yaml @@ -15,12 +15,12 @@ {% endfor %} ceph-osd: charm: "local:{{ ubuntu.release }}/ceph-osd" - num_units: {{ opnfv.units - 1 }} + num_units: {{ opnfv.units }} options: osd-devices: {{ opnfv.storage_dict.ceph.disk }} osd-reformat: 'yes' to: -{% for unit_id in range(1, opnfv.units) %} +{% for unit_id in range(0, opnfv.units) %} - "nodes={{ unit_id }}" {% endfor %} ceph-radosgw: diff --git a/ci/bundle_tpl/neutron-gateway.yaml b/ci/bundle_tpl/neutron-gateway.yaml index fd627642..2148fd79 100644 --- a/ci/bundle_tpl/neutron-gateway.yaml +++ b/ci/bundle_tpl/neutron-gateway.yaml @@ -3,8 +3,20 @@ options: {% if opnfv.spaces_dict.data is defined %} os-data-network: {{ opnfv.spaces_dict.data.cidr }} +{% else %} + #os-data-network: {{ opnfv.spaces_dict.data.cidr }} {% endif %} +{% if os.network.controller == 'nosdn' %} {% if opnfv.ext_port is defined %} +{% if opnfv.data_port is defined %} + bridge-mappings: physnet1:br-data external:br-ex + data-port: br-data:{{ opnfv.data_port }} br-ex:{{ opnfv.ext_port }} +{% else %} + bridge-mappings: external:br-ex + data-port: br-ex:{{ opnfv.ext_port }} +{% endif %} +{% endif %} +{% else %} ext-port: {{ opnfv.ext_port }} {% endif %} {% if os.network.controller == 'odl' %} diff --git a/ci/bundle_tpl/neutron-ovs.yaml b/ci/bundle_tpl/neutron-ovs.yaml index c0d34689..6233421c 100644 --- a/ci/bundle_tpl/neutron-ovs.yaml +++ b/ci/bundle_tpl/neutron-ovs.yaml @@ -3,6 +3,8 @@ options: {% if opnfv.spaces_dict.data is defined %} os-data-network: {{ opnfv.spaces_dict.data.cidr }} +{% else %} + #os-data-network: {{ opnfv.spaces_dict.data.cidr }} {% endif %} {% if os.network.dpdk %} enable-dpdk: true diff --git a/ci/openstack.sh b/ci/openstack.sh index 6ccea248..7cd7efd0 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -137,20 +137,28 @@ create_openrc ## Create external subnet Network ## -#neutron net-create ext-net --shared --router:external=True -neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net --router:external=True - if [ "onos" == "$1" ]; then launch_eth + neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net --router:external=True 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 --dns-nameserver 8.8.8.8 $EXTNET_NET + --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET #neutron subnet-create ext-net --name ext-subnet $EXTNET_NET #update_gw_mac +elif [ "nosdn" == "$1" ]; then + neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \ + --router:external=True \ + --provider:network_type flat \ + --provider:physical_network external + + 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 else + neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net --router:external=True 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 --dns-nameserver 8.8.8.8 $EXTNET_NET + --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET fi |