summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/03-maasdeploy.sh4
-rwxr-xr-xjuju/joid-configure-openstack21
-rw-r--r--labconfig/enea/pod5/labconfig.yaml96
-rw-r--r--labconfig/lenovo/pod1/labconfig.yaml4
4 files changed, 69 insertions, 56 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index 7f587aad..bb21fe34 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -60,10 +60,10 @@ sudo apt-get update -y || true
sudo apt-get install bridge-utils openssh-server bzr git virtinst qemu-kvm libvirt-bin \
maas maas-region-controller juju python-pip python-psutil python-openstackclient \
python-congressclient gsutil charm-tools pastebinit python-jinja2 sshpass \
- openssh-server vlan ipmitool jq expect snap -y
+ openssh-server vlan ipmitool jq expect snap -y --allow-unauthenticated
if [ "aarch64" == "$NODE_ARCTYPE" ]; then
- sudo apt-get install qemu qemu-efi qemu-system-aarch64 -y
+ sudo apt-get install qemu qemu-efi qemu-system-aarch64 -y --allow-unauthenticated
fi
sudo -H pip install --upgrade pip
diff --git a/juju/joid-configure-openstack b/juju/joid-configure-openstack
index ab4c1670..0feebeec 100755
--- a/juju/joid-configure-openstack
+++ b/juju/joid-configure-openstack
@@ -92,13 +92,22 @@ echo "Uploading images to glance"
#Upload images to glance
## image name is used by script to generate metadata .. don't screw the series
+NODE_ARCTYPE=`arch`
+
+if [ "ppc64le" == "$NODE_ARCTYPE" ]; then
+ NODE_ARCHES="ppc64el"
+elif [ "aarch64" == "$NODE_ARCTYPE" ]; then
+ NODE_ARCHES="arm64"
+else
+ NODE_ARCHES="amd64"
+fi
if grep -q 'virt-type: lxd' bundles.yaml; then
- openstack image list | grep "Xenial LXC x86_64" > /dev/null 2>&1 || glance image-create --name="Xenial LXC x86_64" --visibility=public --container-format=bare --disk-format=root-tar --property architecture="x86_64" < /srv/data/xenial-server-cloudimg-amd64-root.tar.gz
- openstack image list | grep "Cirros LXC 0.3" > /dev/null 2>&1 || glance image-create --name="Cirros LXC 0.3" --visibility=public --container-format=bare --disk-format=root-tar --property architecture="x86_64" < /srv/data/cirros-0.3.4-x86_64-lxc.tar.gz
+ openstack image list | grep "Xenial LXC" > /dev/null 2>&1 || glance image-create --name="Xenial LXC" --visibility=public --container-format=bare --disk-format=root-tar --property architecture="$NODE_ARCTYPE" < /srv/data/xenial-server-cloudimg-$NODE_ARCHES-root.tar.gz
+ openstack image list | grep "Cirros LXC" > /dev/null 2>&1 || glance image-create --name="Cirros LXC" --visibility=public --container-format=bare --disk-format=root-tar --property architecture="$NODE_ARCTYPE" < /srv/data/cirros-dl161201-$NODE_ARCTYPE-lxc.tar.gz
else
- openstack image list | grep "Trusty x86_64" > /dev/null 2>&1 || openstack image create "Trusty x86_64" --public --container-format=ovf --disk-format=qcow2 < /srv/data/trusty-server-cloudimg-amd64-disk1.img
- openstack image list | grep "Xenial x86_64" > /dev/null 2>&1 || openstack image create "Xenial x86_64" --public --container-format=ovf --disk-format=qcow2 < /srv/data/xenial-server-cloudimg-amd64-disk1.img
- openstack image list | grep "CentOS 6.4" > /dev/null 2>&1 || openstack image create "CentOS 6.4" --public --container-format=bare --disk-format=qcow2 < /srv/data/centos6.4-x86_64-gold-master.img
- openstack image list | grep "Cirros 0.3" > /dev/null 2>&1 || openstack image create "Cirros 0.3" --public --container-format=bare --disk-format=qcow2 < /srv/data/cirros-0.3.4-x86_64-disk.img
+ openstack image list | grep "Trusty" > /dev/null 2>&1 || openstack image create "Trusty" --public --container-format=ovf --disk-format=qcow2 --property architecture="$NODE_ARCTYPE" < /srv/data/trusty-server-cloudimg-$NODE_ARCHES-uefi1.img
+ openstack image list | grep "Xenial" > /dev/null 2>&1 || openstack image create "Xenial" --public --container-format=ovf --disk-format=qcow2 --property architecture="$NODE_ARCTYPE" < /srv/data/xenial-server-cloudimg-$NODE_ARCHES-uefi1.img
+ openstack image list | grep "CentOS" > /dev/null 2>&1 || openstack image create "CentOS" --public --container-format=bare --disk-format=qcow2 < /srv/data/CentOS-7-x86_64-GenericCloud.qcow2
+ openstack image list | grep "Cirros" > /dev/null 2>&1 || openstack image create "Cirros" --public --container-format=bare --disk-format=qcow2 --property architecture="$NODE_ARCTYPE" < /srv/data/cirros-dl161201-$NODE_ARCTYPE-disk.img
fi
diff --git a/labconfig/enea/pod5/labconfig.yaml b/labconfig/enea/pod5/labconfig.yaml
index 3e016f54..498b0a4f 100644
--- a/labconfig/enea/pod5/labconfig.yaml
+++ b/labconfig/enea/pod5/labconfig.yaml
@@ -10,17 +10,17 @@ lab:
- ifname: intf0
spaces: [admin]
mac: ["e0:ff:f7:00:08:ae"]
- - ifname: intf0.2185
+ - ifname: intf1
+ spaces: [floating]
+ mac: ["e0:ff:f7:00:08:af"]
+ - ifname: intf1.2185
spaces: [data]
- mac: ["e0:ff:f7:00:08:ae"]
- - ifname: intf0.2183
+ mac: ["e0:ff:f7:00:08:af"]
+ - ifname: intf1.2183
spaces: [public]
- mac: ["e0:ff:f7:00:08:ae"]
- - ifname: intf0.2184
+ mac: ["e0:ff:f7:00:08:af"]
+ - ifname: intf1.2184
spaces: [storage]
- mac: ["e0:ff:f7:00:08:ae"]
- - ifname: intf1
- spaces: [floating]
mac: ["e0:ff:f7:00:08:af"]
power:
type: ipmi
@@ -34,17 +34,17 @@ lab:
- ifname: intf0
spaces: [admin]
mac: ["e0:ff:f7:00:08:b1"]
- - ifname: intf0.2185
+ - ifname: intf1
+ spaces: [floating]
+ mac: ["e0:ff:f7:00:08:b2"]
+ - ifname: intf1.2185
spaces: [data]
- mac: ["e0:ff:f7:00:08:b1"]
- - ifname: intf0.2183
+ mac: ["e0:ff:f7:00:08:b2"]
+ - ifname: intf1.2183
spaces: [public]
- mac: ["e0:ff:f7:00:08:b1"]
- - ifname: intf0.2184
+ mac: ["e0:ff:f7:00:08:b2"]
+ - ifname: intf1.2184
spaces: [storage]
- mac: ["e0:ff:f7:00:08:b1"]
- - ifname: intf1
- spaces: [floating]
mac: ["e0:ff:f7:00:08:b2"]
power:
type: ipmi
@@ -59,17 +59,17 @@ lab:
- ifname: intf0
spaces: [admin]
mac: ["e0:ff:f7:00:08:bd"]
- - ifname: intf0.2185
+ - ifname: intf1
+ spaces: [floating]
+ mac: ["e0:ff:f7:00:08:be"]
+ - ifname: intf1.2185
spaces: [data]
- mac: ["e0:ff:f7:00:08:bd"]
- - ifname: intf0.2183
+ mac: ["e0:ff:f7:00:08:be"]
+ - ifname: intf1.2183
spaces: [public]
- mac: ["e0:ff:f7:00:08:bd"]
- - ifname: intf0.2184
+ mac: ["e0:ff:f7:00:08:be"]
+ - ifname: intf1.2184
spaces: [storage]
- mac: ["e0:ff:f7:00:08:bd"]
- - ifname: intf1
- spaces: [floating]
mac: ["e0:ff:f7:00:08:be"]
power:
type: ipmi
@@ -84,17 +84,17 @@ lab:
- ifname: intf0
spaces: [admin]
mac: ["e0:ff:f7:00:08:c6"]
- - ifname: intf0.2185
+ - ifname: intf1
+ spaces: [floating]
+ mac: ["e0:ff:f7:00:08:c7"]
+ - ifname: intf1.2185
spaces: [data]
- mac: ["e0:ff:f7:00:08:c6"]
- - ifname: intf0.2183
+ mac: ["e0:ff:f7:00:08:c7"]
+ - ifname: intf1.2183
spaces: [public]
- mac: ["e0:ff:f7:00:08:c6"]
- - ifname: intf0.2184
+ mac: ["e0:ff:f7:00:08:c7"]
+ - ifname: intf1.2184
spaces: [storage]
- mac: ["e0:ff:f7:00:08:c6"]
- - ifname: intf1
- spaces: [floating]
mac: ["e0:ff:f7:00:08:c7"]
power:
type: ipmi
@@ -109,17 +109,17 @@ lab:
- ifname: intf0
spaces: [admin]
mac: ["e0:ff:f7:00:08:cf"]
- - ifname: intf0.2185
+ - ifname: intf1
+ spaces: [floating]
+ mac: ["e0:ff:f7:00:08:d0"]
+ - ifname: intf1.2185
spaces: [data]
- mac: ["e0:ff:f7:00:08:cf"]
- - ifname: intf0.2183
+ mac: ["e0:ff:f7:00:08:d0"]
+ - ifname: intf1.2183
spaces: [public]
- mac: ["e0:ff:f7:00:08:cf"]
- - ifname: intf0.2184
+ mac: ["e0:ff:f7:00:08:d0"]
+ - ifname: intf1.2184
spaces: [storage]
- mac: ["e0:ff:f7:00:08:cf"]
- - ifname: intf1
- spaces: [floating]
mac: ["e0:ff:f7:00:08:d0"]
power:
type: ipmi
@@ -130,6 +130,7 @@ lab:
ext-port: "intf1"
dns: 8.8.8.8
osdomainname:
+#below section shoiuld define the jumphost.
opnfv:
release: d
distro: xenial
@@ -143,24 +144,27 @@ opnfv:
feature: odl_l2
spaces:
- type: admin
- bridge: brAdm
+ bridge: admin7_br0
cidr: 192.168.11.0/24
gateway: 192.168.11.1
vlan:
+ - type: floating
+ cidr: 10.0.8.0/24
+ gateway: 10.0.8.254
+ mac: ["00:0f:b7:04:00:c2"]
+ vlan:
- type: data
- bridge: brData
cidr: 10.1.0.0/24
gateway:
+ mac: ["00:0f:b7:04:00:c2"]
vlan: 2185
- type: public
cidr: 172.16.10.0/24
gateway:
+ mac: ["00:0f:b7:04:00:c2"]
vlan: 2183
- type: storage
cidr: 10.2.0.0/24
gateway:
+ mac: ["00:0f:b7:04:00:c2"]
vlan: 2184
- - type: floating
- cidr: 10.0.8.0/24
- gateway: 10.0.8.254
- vlan:
diff --git a/labconfig/lenovo/pod1/labconfig.yaml b/labconfig/lenovo/pod1/labconfig.yaml
index a29282da..ab479420 100644
--- a/labconfig/lenovo/pod1/labconfig.yaml
+++ b/labconfig/lenovo/pod1/labconfig.yaml
@@ -69,10 +69,10 @@ lab:
nics:
- ifname: intf100
spaces: [admin]
- mac: ["24:8a:07:3f:95:fe"]
+ mac: ["24:8a:07:3f:95:b6"]
- ifname: intf101
spaces: [floating]
- mac: ["24:8a:07:3f:95:ff"]
+ mac: ["24:8a:07:3f:95:b7"]
power:
type: ipmi
address: 192.0.5.129