From af331643dc0af5e3fb8bebfa9efb2682e46451b8 Mon Sep 17 00:00:00 2001 From: "Areli, Fuss (af732p)" Date: Thu, 24 May 2018 11:24:40 +0300 Subject: Alignment of VVP devkit Alignment of VVP devkit Change-Id: I7c6dae29faf0a14dce4d40114bd0bc4be8e23e42 Issue-ID: VVP-60 Signed-off-by: Areli, Fuss (af732p) --- vagrant/pxe/Vagrantfile | 6 +++--- vagrant/pxe/single_node_config.yml | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'vagrant') diff --git a/vagrant/pxe/Vagrantfile b/vagrant/pxe/Vagrantfile index 864c056..8aad897 100644 --- a/vagrant/pxe/Vagrantfile +++ b/vagrant/pxe/Vagrantfile @@ -103,14 +103,14 @@ Vagrant.configure("2") do |config| conf.vm.network :private_network, :adapter => 2, :ip => box["ips"][0], - :mac => box["macs"][0], - :nic_type => "virtio" + :mac => box["macs"][0] ####, + ####:nic_type => "virtio" conf.vm.network :private_network, :adapter => 3, :ip => box["ips"][1], :mac => box["macs"][1], - :nic_type => "virtio", + ####:nic_type => "virtio", :type => :static if box["groups"].include? "centos" then diff --git a/vagrant/pxe/single_node_config.yml b/vagrant/pxe/single_node_config.yml index 17ff408..f48e22f 100644 --- a/vagrant/pxe/single_node_config.yml +++ b/vagrant/pxe/single_node_config.yml @@ -40,12 +40,13 @@ boxen: - name: ops-01 box: centos/7 ips: ['10.252.0.2', "10.220.220.2"] - macs: [] + macs: ["08002767736a" , "0800278a5a17"] cpus: 1 cpu: "50" memory: "1024" groups: ["bootstrap", "centos",] vagrant_ssh_port: 2502 + nic_type: 82540EM - name: ceph-01 box: centos/7 @@ -56,6 +57,7 @@ boxen: macs: ["0800276695A1","0800276695A2"] groups: ["ceph", "osds", "mons", "rgws", "rbdhost", "centos"] vagrant_ssh_port: 2521 + nic_type: 82540EM - name: coreos-01 box: vvp-empty @@ -66,6 +68,7 @@ boxen: ips: ["10.252.0.12", "10.220.220.12"] groups: ["coreos", "container-hosts", "fleetctl-host"] vagrant_ssh_port: 2512 + nic_type: "virtio" hosts: -- cgit 1.2.3-korg