diff options
| -rw-r--r-- | newton/pom.xml | 2 | ||||
| -rw-r--r-- | ocata/pom.xml | 2 | ||||
| -rw-r--r-- | ocata/vagrant/bootstrap.sh | 9 | ||||
| -rw-r--r-- | ocata/vagrant/setup_compute.sh | 3 | ||||
| -rw-r--r-- | windriver/pom.xml | 2 |
5 files changed, 10 insertions, 8 deletions
diff --git a/newton/pom.xml b/newton/pom.xml index d8c087c2..56ac055e 100644 --- a/newton/pom.xml +++ b/newton/pom.xml @@ -24,7 +24,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.multicloud.openstack</groupId> <artifactId>multicloud-openstack-newton</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <packaging>pom</packaging> <name>multicloud/openstack/newton</name> <description>multicloud for openstack newton</description> diff --git a/ocata/pom.xml b/ocata/pom.xml index b2d1c20d..b2934fcc 100644 --- a/ocata/pom.xml +++ b/ocata/pom.xml @@ -29,7 +29,7 @@ <dependency> <groupId>org.onap.multicloud.openstack</groupId> <artifactId>multicloud-openstack-newton</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <type>zip</type> </dependency> </dependencies> diff --git a/ocata/vagrant/bootstrap.sh b/ocata/vagrant/bootstrap.sh index 2f2d1b12..8bbd7dd6 100644 --- a/ocata/vagrant/bootstrap.sh +++ b/ocata/vagrant/bootstrap.sh @@ -8,9 +8,10 @@ git clone https://github.com/openstack-dev/devstack cd devstack; git checkout stable/ocata sudo apt-get install openvswitch-switch -y sudo ovs-vsctl add-br br-ex -ip=$(ip a s enp0s9 | grep inet | grep -v inet6 | sed "s/.*inet//" | cut -f2 -d' ') -sudo ip address flush enp0s9 -sudo ovs-vsctl add-port br-ex enp0s9 +ctl_if=$(ifconfig | grep 192.168.* -B 1 | awk -F " " 'NR==4{print $1}') +ip=$(ip a s $ctl_if | grep inet | grep -v inet6 | sed "s/.*inet//" | cut -f2 -d' ') +sudo ip address flush $ctl_if +sudo ovs-vsctl add-port br-ex $ctl_if sudo ip a a $ip dev br-ex sudo ip link set dev br-ex up -sudo ip link set dev enp0s9 up +sudo ip link set dev $ctl_if up diff --git a/ocata/vagrant/setup_compute.sh b/ocata/vagrant/setup_compute.sh index 56ef08b6..3f503531 100644 --- a/ocata/vagrant/setup_compute.sh +++ b/ocata/vagrant/setup_compute.sh @@ -4,7 +4,8 @@ set -ex cd devstack cp /vagrant/compute.conf local.conf -ip=$(ip a s enp0s8 | grep inet | grep -v inet6 | sed "s/.*inet //" | cut -f1 -d'/') +data_if=$(ifconfig | grep 192.168.* -B 1 | awk -F " " 'NR==1{print $1}') +ip=$(ip a s $data_if | grep inet | grep -v inet6 | sed "s/.*inet //" | cut -f1 -d'/') host=$(hostname) sed -i -e "s/HOSTIP/$ip/" -e "s/HOSTNAME/$host/" local.conf ./stack.sh diff --git a/windriver/pom.xml b/windriver/pom.xml index efc09903..88036291 100644 --- a/windriver/pom.xml +++ b/windriver/pom.xml @@ -29,7 +29,7 @@ <dependency> <groupId>org.onap.multicloud.openstack</groupId> <artifactId>multicloud-openstack-newton</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <type>zip</type> </dependency> </dependencies> |