diff --git a/lte/cloud/configs/lte.yml b/lte/cloud/configs/lte.yml index 3878c7114b5f..6e39d381fc13 100644 --- a/lte/cloud/configs/lte.yml +++ b/lte/cloud/configs/lte.yml @@ -9,3 +9,4 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +test change diff --git a/lte/gateway/Vagrantfile b/lte/gateway/Vagrantfile index c245de5dbd1e..6f8ccc1bc159 100644 --- a/lte/gateway/Vagrantfile +++ b/lte/gateway/Vagrantfile @@ -18,16 +18,17 @@ Vagrant.require_version ">=1.9.1" Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Mount magma directory in all VMs - config.vm.synced_folder "../..", "/home/vagrant/magma" + config.vm.synced_folder "../..", "/home/vagrant/magma", type: 'nfs', linux__nfs_options: ['rw','no_subtree_check', 'no_root_squash'] config.vm.define :magma, primary: true do |magma| # Get our prepackaged box from the atlas cloud, based on # - debian/contrib-jessie64 # - linux kernel from debian jessie backports # - updated vbguest-tool - magma.vm.box = "fbcmagma/magma_dev" + magma.vm.box = "magma_dev_libvirt" + #magma.vm.box = "fbcmagma/magma_dev" magma.vm.hostname = "magma-dev" - magma.vm.box_version = "1.0.1604610159" + #magma.vm.box_version = "1.0.1594511999" magma.vbguest.auto_update = false # Create a private network, which allows host-only access to the machine @@ -43,6 +44,26 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| vb.customize ["modifyvm", :id, "--cpus", "4"] vb.customize ["modifyvm", :id, "--nicpromisc2", "allow-all"] end + + config.vm.provider :libvirt do |domain| + domain.uri = "qemu+unix:///system" + domain.memory = 6144 + domain.cpus = 4 + domain.driver = "kvm" + domain.host = "localhost" + domain.connect_via_ssh = false + domain.username = $user + domain.storage_pool_name = "default" + domain.nic_model_type = "virtio" + domain.management_network_name = "magma-mgmt-net" + domain.management_network_address = "172.17.2.0/24" + domain.nested = true + domain.cpu_mode = "host-passthrough" + domain.volume_cache = "unsafe" + domain.disk_bus = "virtio" + domain.graphics_ip = "0.0.0.0" + end + magma.vm.provision "ansible" do |ansible| ansible.host_key_checking = false ansible.playbook = "deploy/magma_dev.yml" @@ -54,9 +75,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| end config.vm.define :magma_trfserver, autostart: false do |magma_trfserver| - magma_trfserver.vm.box = "fbcmagma/magma_trfserver" + magma_trfserver.vm.box = "magma_trfserver_libvirt" + #magma_trfserver.vm.box = "fbcmagma/magma_trfserver" magma_trfserver.vm.hostname = "magma-trfserver" - magma_trfserver.vm.box_version = "1.0.1551294676" + #magma_trfserver.vm.box_version = "1.0.1551294676" magma_trfserver.vbguest.auto_update = false # Create a private network, which allows host-only access to the machine @@ -73,6 +95,25 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| vb.customize ["modifyvm", :id, "--nicpromisc2", "allow-all"] end + config.vm.provider :libvirt do |domain| + domain.uri = "qemu+unix:///system" + domain.memory = 6144 + domain.cpus = 4 + domain.driver = "kvm" + domain.host = "localhost" + domain.connect_via_ssh = false + domain.username = $user + domain.storage_pool_name = "default" + domain.nic_model_type = "virtio" + domain.management_network_name = "magma-mgmt-net" + domain.management_network_address = "172.17.2.0/24" + domain.nested = true + domain.cpu_mode = "host-passthrough" + domain.volume_cache = "unsafe" + domain.disk_bus = "virtio" + domain.graphics_ip = "0.0.0.0" + end + magma_trfserver.vm.provision "ansible" do |ansible| ansible.host_key_checking = false ansible.playbook = "deploy/magma_trfserver.yml" @@ -85,9 +126,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.define :magma_test, autostart: false do |magma_test| # Get our prepackaged box from the atlas cloud - magma_test.vm.box = "fbcmagma/magma_test" + magma_test.vm.box = "magma_test_libvirt" + #magma_test.vm.box = "fbcmagma/magma_test" magma_test.vm.hostname = "magma-test" - magma_test.vm.box_version = "1.0.1581466527" + #magma_test.vm.box_version = "1.0.1581466527" magma_test.vbguest.auto_update = false # Create a private network, which allows host-only access to the machine @@ -106,6 +148,25 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| vb.customize ["modifyvm", :id, "--nicpromisc2", "allow-all"] end + config.vm.provider :libvirt do |domain| + domain.uri = "qemu+unix:///system" + domain.memory = 1024 + domain.cpus = 1 + domain.driver = "kvm" + domain.host = "localhost" + domain.connect_via_ssh = false + domain.username = $user + domain.storage_pool_name = "default" + domain.nic_model_type = "virtio" + domain.management_network_name = "magma-mgmt-net" + domain.management_network_address = "172.17.2.0/24" + domain.nested = true + domain.cpu_mode = "host-passthrough" + domain.volume_cache = "unsafe" + domain.disk_bus = "virtio" + domain.graphics_ip = "0.0.0.0" + end + magma_test.vm.provision "ansible" do |ansible| ansible.host_key_checking = false ansible.playbook = "deploy/magma_test.yml" @@ -191,3 +252,4 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| end end +