From 1d9656d5db8d7e55e88e8aaa5ced95dbfdda113d Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Wed, 1 Nov 2017 16:57:34 -0500 Subject: [PATCH] New lab added for arm64 bit. modified as per comment from Alex for experimental basis. Change-Id: Icb28ffb60589d55952c387a8aeb946700ad36b85 Signed-off-by: Narinder Gupta --- juju/get-cloud-images | 21 +++-- labconfig/enea/pod5/labconfig.yaml | 166 +++++++++++++++++++++++++++++++++++++ 2 files changed, 182 insertions(+), 5 deletions(-) create mode 100644 labconfig/enea/pod5/labconfig.yaml diff --git a/juju/get-cloud-images b/juju/get-cloud-images index 3711729c..9711b793 100755 --- a/juju/get-cloud-images +++ b/juju/get-cloud-images @@ -3,18 +3,29 @@ folder=/srv/data/ sudo mkdir $folder || true +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 URLS=" \ - http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-lxc.tar.gz \ - http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-root.tar.gz " + http://download.cirros-cloud.net/daily/20161201/cirros-dl161201-$NODE_ARCTYPE-lxc.tar.gz \ + http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-$NODE_ARCHES-root.tar.gz " else URLS=" \ - http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img \ - http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img \ + http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-$NODE_ARCHES-uefi1.img \ + http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-$NODE_ARCHES-uefi1.img \ http://mirror.catn.com/pub/catn/images/qcow2/centos6.4-x86_64-gold-master.img \ http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2 \ - http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img " + http://download.cirros-cloud.net/daily/20161201/cirros-dl161201-$NODE_ARCTYPE-disk.img " fi for URL in $URLS diff --git a/labconfig/enea/pod5/labconfig.yaml b/labconfig/enea/pod5/labconfig.yaml new file mode 100644 index 00000000..3e016f54 --- /dev/null +++ b/labconfig/enea/pod5/labconfig.yaml @@ -0,0 +1,166 @@ +lab: + location: enea + racks: + - rack: pod5 + nodes: + - name: softiron-3 + architecture: aarch64 + roles: [network,control] + nics: + - ifname: intf0 + spaces: [admin] + mac: ["e0:ff:f7:00:08:ae"] + - ifname: intf0.2185 + spaces: [data] + mac: ["e0:ff:f7:00:08:ae"] + - ifname: intf0.2183 + spaces: [public] + mac: ["e0:ff:f7:00:08:ae"] + - ifname: intf0.2184 + spaces: [storage] + mac: ["e0:ff:f7:00:08:ae"] + - ifname: intf1 + spaces: [floating] + mac: ["e0:ff:f7:00:08:af"] + power: + type: ipmi + address: 10.0.8.3 + user: admin + pass: admin + - name: softiron-4 + architecture: aarch64 + roles: [network,control] + nics: + - ifname: intf0 + spaces: [admin] + mac: ["e0:ff:f7:00:08:b1"] + - ifname: intf0.2185 + spaces: [data] + mac: ["e0:ff:f7:00:08:b1"] + - ifname: intf0.2183 + spaces: [public] + mac: ["e0:ff:f7:00:08:b1"] + - ifname: intf0.2184 + spaces: [storage] + mac: ["e0:ff:f7:00:08:b1"] + - ifname: intf1 + spaces: [floating] + mac: ["e0:ff:f7:00:08:b2"] + power: + type: ipmi + address: 10.0.8.4 + user: admin + pass: admin + + - name: softiron-5 + architecture: aarch64 + roles: [network,control] + nics: + - ifname: intf0 + spaces: [admin] + mac: ["e0:ff:f7:00:08:bd"] + - ifname: intf0.2185 + spaces: [data] + mac: ["e0:ff:f7:00:08:bd"] + - ifname: intf0.2183 + spaces: [public] + mac: ["e0:ff:f7:00:08:bd"] + - ifname: intf0.2184 + spaces: [storage] + mac: ["e0:ff:f7:00:08:bd"] + - ifname: intf1 + spaces: [floating] + mac: ["e0:ff:f7:00:08:be"] + power: + type: ipmi + address: 10.0.8.5 + user: admin + pass: admin + + - name: softiron-6 + architecture: aarch64 + roles: [network,control] + nics: + - ifname: intf0 + spaces: [admin] + mac: ["e0:ff:f7:00:08:c6"] + - ifname: intf0.2185 + spaces: [data] + mac: ["e0:ff:f7:00:08:c6"] + - ifname: intf0.2183 + spaces: [public] + mac: ["e0:ff:f7:00:08:c6"] + - ifname: intf0.2184 + spaces: [storage] + mac: ["e0:ff:f7:00:08:c6"] + - ifname: intf1 + spaces: [floating] + mac: ["e0:ff:f7:00:08:c7"] + power: + type: ipmi + address: 10.0.8.6 + user: admin + pass: admin + + - name: softiron-7 + architecture: aarch64 + roles: [network,control] + nics: + - ifname: intf0 + spaces: [admin] + mac: ["e0:ff:f7:00:08:cf"] + - ifname: intf0.2185 + spaces: [data] + mac: ["e0:ff:f7:00:08:cf"] + - ifname: intf0.2183 + spaces: [public] + mac: ["e0:ff:f7:00:08:cf"] + - ifname: intf0.2184 + spaces: [storage] + mac: ["e0:ff:f7:00:08:cf"] + - ifname: intf1 + spaces: [floating] + mac: ["e0:ff:f7:00:08:d0"] + power: + type: ipmi + address: 10.0.8.7 + user: admin + pass: admin + floating-ip-range: 10.0.8.40,10.0.8.250,10.0.8.254,10.0.8.0/24 + ext-port: "intf1" + dns: 8.8.8.8 + osdomainname: +opnfv: + release: d + distro: xenial + type: noha + openstack: pike + sdncontroller: + - type: nosdn + storage: + - type: ceph + disk: /dev/sdb + feature: odl_l2 + spaces: + - type: admin + bridge: brAdm + cidr: 192.168.11.0/24 + gateway: 192.168.11.1 + vlan: + - type: data + bridge: brData + cidr: 10.1.0.0/24 + gateway: + vlan: 2185 + - type: public + cidr: 172.16.10.0/24 + gateway: + vlan: 2183 + - type: storage + cidr: 10.2.0.0/24 + gateway: + vlan: 2184 + - type: floating + cidr: 10.0.8.0/24 + gateway: 10.0.8.254 + vlan: -- 2.16.6