diff options
| -rwxr-xr-x | ci/deploy.sh | 10 | ||||
| -rwxr-xr-x | ci/odl/fetch-charms.sh | 3 | ||||
| -rwxr-xr-x | ci/openstack.sh | 3 |
3 files changed, 13 insertions, 3 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 89dcfe0b..d933dbef 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -126,7 +126,15 @@ deploy() { python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml fi else - echo " MAAS not deployed please deploy MAAS first." + if [ -e ./labconfig.yaml ]; then + if [ ! -f ./deployconfig.yaml ] && [ -e ~/joid_config/deployconfig.yaml ]; then + cp ~/joid_config/deployconfig.yaml ./deployconfig.yaml + else + python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml + fi + else + echo " MAAS not deployed please deploy MAAS first." + fi fi else if [ ! -f ./environments.yaml ] && [ -e ~/.juju/environments.yaml ]; then diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh index 790e39ea..f1b2ecb9 100755 --- a/ci/odl/fetch-charms.sh +++ b/ci/odl/fetch-charms.sh @@ -13,6 +13,7 @@ function build { bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp +bzr branch lp:~narindergupta/opnfv/neutron-gateway $distro/neutron-gateway git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress build congress @@ -29,7 +30,7 @@ git clone https://github.com/openstack/charm-glance.git $distro/glance git clone https://github.com/openstack/charm-keystone.git $distro/keystone git clone https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster git clone https://github.com/openstack/charm-neutron-api.git $distro/neutron-api -git clone https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway +#git clone https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute diff --git a/ci/openstack.sh b/ci/openstack.sh index 06e59c4f..71f005e2 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -238,7 +238,8 @@ elif [ "nosdn" == "$opnfvsdn" ]; then elif [ "odl" == "$opnfvsdn" ]; then neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \ --router:external=True \ - --provider:network_type vxlan + --provider:network_type vxlan \ + --provider:physical_network physnet1 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 \ |