summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xci/00-maasdeploy.sh6
-rwxr-xr-xci/02-deploybundle.sh6
-rwxr-xr-xci/03-maasdeploy.sh8
-rwxr-xr-xci/deploy.sh4
-rw-r--r--labconfig/cengn/pod1/labconfig.yaml2
-rw-r--r--labconfig/cengn/pod2/labconfig.yaml2
-rw-r--r--labconfig/huawei/pod12/labconfig.yaml2
-rw-r--r--labconfig/intel/pod5/labconfig.yaml2
-rw-r--r--labconfig/intel/pod6/labconfig.yaml2
-rw-r--r--labconfig/intel/pod9/labconfig.yaml2
-rw-r--r--labconfig/juniper/pod1/labconfig.yaml2
-rw-r--r--labconfig/lenovo/pod1/labconfig.yaml112
-rw-r--r--labconfig/orange/pod1/labconfig.yaml2
-rw-r--r--labconfig/orange/pod2/labconfig.yaml2
14 files changed, 136 insertions, 18 deletions
diff --git a/ci/00-maasdeploy.sh b/ci/00-maasdeploy.sh
index 556b65ab..f87e2d3d 100755
--- a/ci/00-maasdeploy.sh
+++ b/ci/00-maasdeploy.sh
@@ -192,11 +192,11 @@ maas maas sshkeys new key="`cat $HOME/.ssh/id_rsa.pub`"
#adding compute and control nodes VM to MAAS for virtual deployment purpose.
if [ "$virtinstall" -eq 1 ]; then
# create two more VMs to do the deployment.
- sudo virt-install --connect qemu:///system --name node1-control --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node1-control
+ sudo virt-install --connect qemu:///system --name node1-control --ram 8192 --cpu host --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node1-control
- sudo virt-install --connect qemu:///system --name node2-compute --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node2-compute
+ sudo virt-install --connect qemu:///system --name node2-compute --ram 8192 --cpu host --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node2-compute
- sudo virt-install --connect qemu:///system --name node5-compute --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node5-compute
+ sudo virt-install --connect qemu:///system --name node5-compute --ram 8192 --cpu host --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node5-compute
node1controlmac=`grep "mac address" node1-control | head -1 | cut -d "'" -f 2`
node2computemac=`grep "mac address" node2-compute | head -1 | cut -d "'" -f 2`
diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index 23107878..e34f3d70 100755
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -53,6 +53,12 @@ check_status() {
#read the value from deployment.yaml
+PROFILE=maas
+MAAS_IP=$(grep " ip_address" deployment.yaml | cut -d ':' -f 2 | sed -e 's/ //')
+API_SERVERMAAS="http://$MAAS_IP/MAAS/"
+API_KEY=`sudo maas-region apikey --username=ubuntu`
+maas login $PROFILE $API_SERVERMAAS $API_KEY
+
if [[ "$opnfvmodel" = "openstack" ]]; then
if [ -e ./deployment.yaml ]; then
if [ -e ./deployconfig.yaml ]; then
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index 2c7a16a8..0a934c20 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -275,7 +275,7 @@ parse_yaml2() {
}
addnodes(){
- sudo virt-install --connect qemu:///system --name bootstrap --ram 2048 --vcpus 2 --video \
+ sudo virt-install --connect qemu:///system --name bootstrap --ram 4098 --cpu host --vcpus 2 --video \
cirrus --arch x86_64 --disk size=20,format=qcow2,bus=virtio,io=native,pool=default \
--network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole \
--vnc --print-xml | tee bootstrap
@@ -325,11 +325,11 @@ fi
#adding compute and control nodes VM to MAAS for virtual deployment purpose.
if [ "$virtinstall" -eq 1 ]; then
# create two more VMs to do the deployment.
- sudo virt-install --connect qemu:///system --name node1-control --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node1-control
+ sudo virt-install --connect qemu:///system --name node1-control --ram 8192 --cpu host --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node1-control
- sudo virt-install --connect qemu:///system --name node2-compute --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node2-compute
+ sudo virt-install --connect qemu:///system --name node2-compute --ram 8192 --cpu host --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node2-compute
- sudo virt-install --connect qemu:///system --name node5-compute --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node5-compute
+ sudo virt-install --connect qemu:///system --name node5-compute --ram 8192 --cpu host --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node5-compute
node1controlmac=`grep "mac address" node1-control | head -1 | cut -d '"' -f 2`
node2computemac=`grep "mac address" node2-compute | head -1 | cut -d '"' -f 2`
diff --git a/ci/deploy.sh b/ci/deploy.sh
index d99c53e3..9d24d2f8 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -81,9 +81,9 @@ createresource() {
nodeexist=`maas maas nodes list hostname=node3-control`
if [ $nodeexist != *node3* ]; then
- sudo virt-install --connect qemu:///system --name node3-control --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node3-control
+ sudo virt-install --connect qemu:///system --name node3-control --ram 8192 --cpu host --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node3-control
- sudo virt-install --connect qemu:///system --name node4-control --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node4-control
+ sudo virt-install --connect qemu:///system --name node4-control --ram 8192 --cpu host --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node4-control
node3controlmac=`grep "mac address" node3-control | head -1 | cut -d "'" -f 2`
node4controlmac=`grep "mac address" node4-control | head -1 | cut -d "'" -f 2`
diff --git a/labconfig/cengn/pod1/labconfig.yaml b/labconfig/cengn/pod1/labconfig.yaml
index 16fc3818..63a24071 100644
--- a/labconfig/cengn/pod1/labconfig.yaml
+++ b/labconfig/cengn/pod1/labconfig.yaml
@@ -79,7 +79,7 @@ lab:
user: admin
pass: admin
floating-ip-range: 10.21.6.6,10.21.6.250,10.21.6.254,10.21.6.0/24
- ext-port: "eth1"
+ ext-port: "br-eth1"
dns: 8.8.8.8
osdomainname:
opnfv:
diff --git a/labconfig/cengn/pod2/labconfig.yaml b/labconfig/cengn/pod2/labconfig.yaml
index 1b3a1aa3..5523183b 100644
--- a/labconfig/cengn/pod2/labconfig.yaml
+++ b/labconfig/cengn/pod2/labconfig.yaml
@@ -110,7 +110,7 @@ lab:
floating-ip-range: 172.16.120.20,172.16.120.62,172.16.120.254,172.16.120.0/24
# Mutiple MACs seperated by space where MACs are from ext-ports across all network nodes.
# eth1 of m4 since tags for networking are not yet implemented.
- ext-port: "eth1"
+ ext-port: "br-eth1"
dns: 8.8.8.8
osdomainname:
diff --git a/labconfig/huawei/pod12/labconfig.yaml b/labconfig/huawei/pod12/labconfig.yaml
index 0102e547..1915a3e2 100644
--- a/labconfig/huawei/pod12/labconfig.yaml
+++ b/labconfig/huawei/pod12/labconfig.yaml
@@ -94,7 +94,7 @@ lab:
user: root
pass: Huawei12#$
floating-ip-range: 10.6.15.7,10.6.15.250,10.6.15.1,10.6.15.0/24
- ext-port: "eth5"
+ ext-port: "br-enp4s0d1"
dns: 8.8.8.8
public-api-ip:
osdomainname:
diff --git a/labconfig/intel/pod5/labconfig.yaml b/labconfig/intel/pod5/labconfig.yaml
index 441b83a7..8676bf51 100644
--- a/labconfig/intel/pod5/labconfig.yaml
+++ b/labconfig/intel/pod5/labconfig.yaml
@@ -112,7 +112,7 @@ lab:
# user: root
# pass: root
floating-ip-range: 10.5.15.6,10.5.15.250,10.5.15.1,10.5.15.0/24
- ext-port: "eth5"
+ ext-port: "br-eth5"
dns: 8.8.8.8
osdomainname:
opnfv:
diff --git a/labconfig/intel/pod6/labconfig.yaml b/labconfig/intel/pod6/labconfig.yaml
index 251c8607..9682aca8 100644
--- a/labconfig/intel/pod6/labconfig.yaml
+++ b/labconfig/intel/pod6/labconfig.yaml
@@ -112,7 +112,7 @@ lab:
# user: root
# pass: root
floating-ip-range: 10.6.15.7,10.6.15.250,10.6.15.1,10.6.15.0/24
- ext-port: "eth5"
+ ext-port: "br-eth5"
dns: 8.8.8.8
public-api-ip: 10.6.15.6
osdomainname: api.maas
diff --git a/labconfig/intel/pod9/labconfig.yaml b/labconfig/intel/pod9/labconfig.yaml
index 8f4afb15..6b90e819 100644
--- a/labconfig/intel/pod9/labconfig.yaml
+++ b/labconfig/intel/pod9/labconfig.yaml
@@ -112,7 +112,7 @@ lab:
user: root
pass: root
floating-ip-range: 10.9.15.6,10.9.15.250,10.9.15.1,10.9.15.0/24
- ext-port: "eth1.905"
+ ext-port: "br-eth1.905"
dns: 8.8.8.8
osdomainname:
opnfv:
diff --git a/labconfig/juniper/pod1/labconfig.yaml b/labconfig/juniper/pod1/labconfig.yaml
index 369b6a1c..107d1c2b 100644
--- a/labconfig/juniper/pod1/labconfig.yaml
+++ b/labconfig/juniper/pod1/labconfig.yaml
@@ -79,7 +79,7 @@ lab:
user: ADMIN
pass: ADMIN
floating-ip-range: 10.10.10.6,10.10.10.250,10.10.10.1,10.10.10.0/24
- ext-port: "eth1"
+ ext-port: "br-eth1"
dns: 8.8.8.8
osdomainname:
opnfv:
diff --git a/labconfig/lenovo/pod1/labconfig.yaml b/labconfig/lenovo/pod1/labconfig.yaml
new file mode 100644
index 00000000..3efc6633
--- /dev/null
+++ b/labconfig/lenovo/pod1/labconfig.yaml
@@ -0,0 +1,112 @@
+lab:
+ location: lenovo
+ racks:
+ - rack: pod1
+ nodes:
+ - name: rack-1-m1
+ architecture: x86_64
+ roles: [network,control]
+ nics:
+ - ifname: ens1f0
+ spaces: [admin]
+ mac: ["00:1E:67:CF:BB:54"]
+ - ifname: ens1f1
+ spaces: [public]
+ mac: ["90:E2:BA:85:4E:2D"]
+ power:
+ type: ipmi
+ address: 192.0.5.125
+ user: USERID
+ pass: PASSW0RD
+ - name: rack-1-m2
+ architecture: x86_64
+ roles: [compute,control,storage]
+ nics:
+ - ifname: ens1f0
+ spaces: [admin]
+ mac: ["00:1E:67:CF:B8:93"]
+ - ifname: ens1f1
+ spaces: [public]
+ mac: ["90:E2:BA:84:08:B9"]
+ power:
+ type: ipmi
+ address: 192.0.5.126
+ user: USERID
+ pass: PASSW0RD
+ - name: rack-1-m3
+ architecture: x86_64
+ roles: [compute,control,storage]
+ nics:
+ - ifname: ens1f0
+ spaces: [admin]
+ mac: ["00:1E:67:E0:08:7F"]
+ - ifname: ens1f1
+ spaces: [public]
+ mac: ["90:E2:BA:84:07:0E"]
+ power:
+ type: ipmi
+ address: 192.0.5.127
+ user: USERID
+ pass: PASSW0RD
+ - name: rack-1-m4
+ architecture: x86_64
+ roles: [compute,storage]
+ nics:
+ - ifname: ens1f0
+ spaces: [admin]
+ mac: ["00:1E:67:E0:08:B1"]
+ - ifname: ens1f1
+ spaces: [public]
+ mac: ["90:E2:BA:83:FD:81"]
+ power:
+ type: ipmi
+ address: 192.0.5.128
+ user: USERID
+ pass: PASSW0RD
+# - name: rack-1-m5
+# architecture: x86_64
+# roles: [compute,storage]
+# nics:
+# - ifname: ens1f0
+# spaces: [admin]
+# mac: ["00:1E:67:E0:0A:4B"]
+# - ifname: ens1f1
+# spaces: [public]
+# mac: ["90:E2:BA:75:22:75"]
+# power:
+# type: ipmi
+# address: 192.0.5.129
+# user: USERID
+# pass: PASSW0RD
+ floating-ip-range: 172.21.159.6,172.21.159.100,172.21.159.1,172.21.159.0/24
+ ext-port: "br-ens1f1"
+ dns: 8.8.8.8
+ osdomainname:
+opnfv:
+ release: d
+ distro: xenial
+ type: nonha
+ openstack: Newton
+ sdncontroller:
+ - type: nosdn
+ storage:
+ - type: ceph
+ disk: /dev/sdb
+ feature: odl_l2
+ spaces:
+ - type: admin
+ bridge: brAdm
+ cidr: 192.0.5.0/24
+ gateway: 192.0.5.5
+ vlan:
+ - type: public
+ bridge: brPublic
+ cidr: 172.21.159.0/24
+ gateway: 172.21.159.1
+ vlan:
+ - type: external
+ bridge: brExt
+ cidr:
+ gateway: 10.240.71.1
+ ipaddress: 10.240.71.213
+ vlan:
diff --git a/labconfig/orange/pod1/labconfig.yaml b/labconfig/orange/pod1/labconfig.yaml
index a5beed35..205700c6 100644
--- a/labconfig/orange/pod1/labconfig.yaml
+++ b/labconfig/orange/pod1/labconfig.yaml
@@ -95,7 +95,7 @@ lab:
pass: pod1Admin
floating-ip-range: 10.0.1.5,10.0.1.254,10.0.1.1,10.0.1.0/24
public-api-ip: 10.0.1.4
- ext-port: "eth1"
+ ext-port: "br-eth1"
dns: 192.168.1.1
osdomainname: pod1.opnfv.fr
opnfv:
diff --git a/labconfig/orange/pod2/labconfig.yaml b/labconfig/orange/pod2/labconfig.yaml
index 56a38277..98e7ec64 100644
--- a/labconfig/orange/pod2/labconfig.yaml
+++ b/labconfig/orange/pod2/labconfig.yaml
@@ -130,7 +130,7 @@ lab:
user: Administrator
pass: pod2Admin
floating-ip-range: 161.105.231.2,161.105.231.62,161.105.231.1,161.105.231.0/26
- ext-port: "eth1"
+ ext-port: "br-eth1"
dns: 192.168.2.1
osdomainname: pod2.opnfv.fr
opnfv: