diff options
| -rw-r--r-- | vagrant/Vagrantfile | 21 | ||||
| -rw-r--r--[-rwxr-xr-x] | vagrant/create_onap.sh | 10 | ||||
| -rwxr-xr-x | vagrant/run_demo.sh | 5 | ||||
| -rw-r--r-- | vagrant/setup_control.sh | 6 | ||||
| -rwxr-xr-x | vagrant/setup_proxy.sh | 2 |
5 files changed, 28 insertions, 16 deletions
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index 46e1fc2f..3a100c6d 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -1,12 +1,10 @@ -$num_compute_nodes = 1 +$num_compute_nodes = 2 Vagrant.configure("2") do |config| config.vm.box = "bento/ubuntu-16.04" config.vm.provider :virtualbox do |vb| - vb.customize ["modifyvm", :id, "--memory", 8192] - vb.customize ["modifyvm", :id, "--cpus", 8] vb.customize ['modifyvm', :id, '--natnet1', '192.168.240.0/24'] vb.customize ["modifyvm", :id, "--nicpromisc3", "allow-all"] vb.customize "post-boot",["controlvm", :id, "setlinkstate1", "on"] @@ -20,6 +18,10 @@ Vagrant.configure("2") do |config| config.vm.network "private_network", ip: "192.168.0.10" config.vm.network "private_network", ip: "192.168.1.10" config.vm.provision "shell", path: "setup_control.sh", privileged: false + config.vm.provider :virtualbox do |vb| + vb.customize ["modifyvm", :id, "--memory", 8192] + vb.customize ["modifyvm", :id, "--cpus", 8] + end end (1 .. $num_compute_nodes).each do |n| @@ -29,7 +31,7 @@ Vagrant.configure("2") do |config| config.vm.network "private_network", ip: "192.168.1.#{n+20}" config.vm.provision "shell", path: "setup_compute.sh", privileged: false config.vm.provider :virtualbox do |v| - v.customize ["modifyvm", :id, "--memory", 81920] + v.customize ["modifyvm", :id, "--memory", 40960 ] v.customize ["modifyvm", :id, "--cpus", 8] file_to_disk1 = "large_disk_file.#{n}.vdi1" v.customize ['createhd', '--filename', file_to_disk1, '--size', 1000 * 1024] @@ -40,4 +42,15 @@ Vagrant.configure("2") do |config| end end end + + config.vm.define "onap" do |config| + config.vm.hostname = "onap" + config.vm.network "private_network", ip: "192.168.0.2" + config.vm.network "private_network", ip: "192.168.1.2" + config.vm.provision "shell", path: "create_onap.sh", privileged: false + config.vm.provider :virtualbox do |vb| + vb.customize ["modifyvm", :id, "--memory", 4096] + vb.customize ["modifyvm", :id, "--cpus", 4] + end + end end diff --git a/vagrant/create_onap.sh b/vagrant/create_onap.sh index 0b4ed572..55679ab7 100755..100644 --- a/vagrant/create_onap.sh +++ b/vagrant/create_onap.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash set -ex +sudo apt-get install -y python-openstackclient python-heatclient + source /vagrant/openrc cp /demo/heat/ONAP/* . @@ -29,13 +31,15 @@ sed -i "s,keystone_url:.*,keystone_url: http://192.168.0.10/identity/," onap_o sed -i "s/dns_list:.*/dns_list: 8.8.8.8/" onap_openstack.env sed -i "s/external_dns:.*/external_dns: 8.8.8.8/" onap_openstack.env +openstack stack delete --yes --wait ONAP || true openstack stack create -t onap_openstack.yaml -e onap_openstack.env ONAP -sleep 180 +sleep 300 +sudo sed -i "/.*simpledemo.openecomp.org.*/d" /etc/hosts vms=$(grep "_vm:" onap_openstack.yaml | cut -f1 -d"_") -sudo rm -rf /vagrant/hosts for vm in $vms do ip=$(openstack server list --name $vm -f yaml | grep Networks | cut -f2 -d",") - echo "$ip $vm.api.simpledemo.openecomp.org" >> /vagrant/hosts + echo "$ip $vm.api.simpledemo.openecomp.org" | sudo tee -a /etc/hosts done +ssh -o StrictHostKeyChecking=no ubuntu@portal.api.simpledemo.openecomp.org -i onap "curl sina.com.cn" diff --git a/vagrant/run_demo.sh b/vagrant/run_demo.sh index e99b28d7..eaccfad2 100755 --- a/vagrant/run_demo.sh +++ b/vagrant/run_demo.sh @@ -10,8 +10,3 @@ fi vagrant destroy -f vagrant up -vagrant ssh control -c "/vagrant/create_onap.sh" -sudo sed -i "/.*simpledemo.openecomp.org.*/d" /etc/hosts -cat hosts | sudo tee -a /etc/hosts -sleep 300 -ssh -o StrictHostKeyChecking=no ubuntu@portal.api.simpledemo.openecomp.org -i onap "curl sina.com.cn" diff --git a/vagrant/setup_control.sh b/vagrant/setup_control.sh index 6ff364f6..f6bfc7a1 100644 --- a/vagrant/setup_control.sh +++ b/vagrant/setup_control.sh @@ -16,9 +16,9 @@ wget https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server- openstack image create ubuntu1404 --file ubuntu-14.04-server-cloudimg-amd64-disk1.img --disk-format qcow2 openstack image create ubuntu1604 --file ubuntu-16.04-server-cloudimg-amd64-disk1.img --disk-format qcow2 -openstack quota set admin --instances 30 -openstack quota set admin --cores 45 -openstack quota set admin --ram 61440 +openstack quota set admin --instances 32 +openstack quota set admin --cores 128 +openstack quota set admin --ram 102400 openstack flavor delete m1.large openstack flavor create --public m1.large --id auto --ram 6144 --vcpus 3 --disk 80 diff --git a/vagrant/setup_proxy.sh b/vagrant/setup_proxy.sh index da7452e6..d9ee5970 100755 --- a/vagrant/setup_proxy.sh +++ b/vagrant/setup_proxy.sh @@ -3,7 +3,7 @@ set -ex SOCKS5_IP=${SOCKS5_IP:-127.0.0.1} SOCKS5_PORT=${SOCKS5:-1080} -DNS_SERVER=${DNS_SERVER:-10.248.2.5} +DNS_SERVER=${DNS_SERVER:-10.248.2.1} sudo apt-get install -y redsocks iptables |