From 78531c93ab48241aaea8220d7470b2f566a77158 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 14 Oct 2016 15:02:05 +0200 Subject: arm: Add lab-config for Enea Pharos PODs This was previously stored on git.enea.com. While at it, fix Armband master deploy issues by adjusting version strings in DHA files. JIRA: ARMBAND-149 JIRA: ARMBAND-150 Change-Id: I2e9580465e8fc2052dfe7fd353e00fd93a10219b Signed-off-by: Alexandru Avadanii (cherry picked from commit 66547b5fc9997fe4a8c1135af2d2f7cfac2ce273) --- labs/arm/pod1/fuel/config/dea-pod-override.yaml | 375 ++++++++++++++++++++++++ labs/arm/pod1/fuel/config/dha.yaml | 79 +++++ labs/arm/pod1/fuel/config/local_env | 3 + 3 files changed, 457 insertions(+) create mode 100644 labs/arm/pod1/fuel/config/dea-pod-override.yaml create mode 100644 labs/arm/pod1/fuel/config/dha.yaml create mode 100644 labs/arm/pod1/fuel/config/local_env (limited to 'labs/arm/pod1') diff --git a/labs/arm/pod1/fuel/config/dea-pod-override.yaml b/labs/arm/pod1/fuel/config/dea-pod-override.yaml new file mode 100644 index 0000000..6348d6a --- /dev/null +++ b/labs/arm/pod1/fuel/config/dea-pod-override.yaml @@ -0,0 +1,375 @@ +dea-pod-override-config-metadata: + title: 'DEA for Enea Armband lab' + version: '0.1' + created: 'Mon May 2 2016' + comment: 'Armband specific' + public_bridge: 'public6_br0' +environment: + name: armband_opnfv + net_segment_type: tun +interfaces_1: + enm2p1s0f2: + - storage + enm2p1s0f3: + - public + - management + - private + enm5p144s0: + - fuelweb_admin +transformations_1: + transformations: + - action: add-br + name: br-fw-admin + - action: add-br + name: br-mgmt + - action: add-br + name: br-storage + - action: add-br + name: br-ex + - action: add-br + name: br-floating + provider: ovs + - action: add-patch + bridges: + - br-floating + - br-ex + mtu: 65000 + provider: ovs + - action: add-br + name: br-mesh + - action: add-port + bridge: br-ex + name: enm2p1s0f3 + - action: add-port + bridge: br-mgmt + name: enm2p1s0f3.2164 + - action: add-port + bridge: br-storage + name: enm2p1s0f3.2163 + - action: add-port + bridge: br-mesh + name: enm2p1s0f3.2165 + - action: add-port + bridge: br-fw-admin + name: enm5p144s0 +fuel: + ADMIN_NETWORK: + dhcp_pool_end: 10.20.0.254 + dhcp_pool_start: 10.20.0.3 + ipaddress: 10.20.0.2 + netmask: 255.255.255.0 + IFCFG_ETH1: + device: eth1 + ipaddress: 10.0.7.10 + netmask: 255.255.255.0 + gateway: 10.0.7.254 + DNS_DOMAIN: domain.tld + DNS_SEARCH: domain.tld + DNS_UPSTREAM: 8.8.8.8 + FUEL_ACCESS: + password: admin + user: admin + HOSTNAME: fuel + NTP1: 0.pool.ntp.org + NTP2: 1.pool.ntp.org + NTP3: 2.pool.ntp.org +network: + networking_parameters: + base_mac: fa:16:3e:00:00:00 + configuration_template: null + dns_nameservers: + - 8.8.4.4 + - 8.8.8.8 + floating_name: admin_floating_net + floating_ranges: + - - 10.0.7.101 + - 10.0.7.200 + gre_id_range: + - 2 + - 65535 + internal_cidr: 192.168.111.0/24 + internal_gateway: 192.168.111.1 + internal_name: admin_internal_net + net_l23_provider: ovs + segmentation_type: tun + vlan_range: + - 1000 + - 1030 + networks: + - cidr: 10.0.7.0/24 + gateway: 10.0.7.254 + ip_ranges: + - - 10.0.7.40 + - 10.0.7.100 + meta: + cidr: 172.16.0.0/24 + configurable: true + floating_range_var: floating_ranges + ip_range: + - 172.16.0.2 + - 172.16.0.126 + map_priority: 1 + name: public + notation: ip_ranges + render_addr_mask: public + render_type: null + use_gateway: true + vips: + - haproxy + - vrouter + vlan_start: null + name: public + vlan_start: null + - cidr: 192.168.1.0/24 + gateway: null + ip_ranges: + - - 192.168.1.1 + - 192.168.1.254 + meta: + cidr: 192.168.1.0/24 + configurable: true + map_priority: 2 + name: storage + notation: cidr + render_addr_mask: storage + render_type: cidr + use_gateway: false + vlan_start: 102 + name: storage + vlan_start: 2163 + - cidr: 192.168.0.0/24 + gateway: null + ip_ranges: + - - 192.168.0.1 + - 192.168.0.254 + meta: + cidr: 192.168.0.0/24 + configurable: true + map_priority: 2 + name: management + notation: cidr + render_addr_mask: internal + render_type: cidr + use_gateway: false + vips: + - haproxy + - vrouter + vlan_start: 101 + name: management + vlan_start: 2164 + - cidr: 192.168.2.0/24 + gateway: null + ip_ranges: + - - 192.168.2.1 + - 192.168.2.254 + meta: + cidr: 192.168.2.0/24 + configurable: true + map_priority: 2 + name: private + notation: cidr + render_addr_mask: null + render_type: cidr + seg_type: tun + use_gateway: false + vlan_start: 103 + name: private + vlan_start: 2165 + - cidr: 10.20.0.0/24 + gateway: 10.20.0.2 + ip_ranges: + - - 10.20.0.3 + - 10.20.0.254 + meta: + configurable: false + map_priority: 0 + notation: ip_ranges + render_addr_mask: null + render_type: null + unmovable: true + use_gateway: true + name: fuelweb_admin + vlan_start: null +settings: + editable: + kernel_params: + kernel: + description: Default kernel parameters + label: Initial parameters + type: text + value: console=tty0 console=ttyS0,115200 console=ttyAMA0,115200 net.ifnames=1 biosdevname=0 rootdelay=90 nomodeset + repo_setup: + repos: + description: 'Please note: the first repository will be considered the operating + system mirror that will be used during node provisioning. + + To create a local repository mirror on the Fuel master node, please follow + the instructions provided by running "fuel-createmirror --help" on the Fuel + master node. + + Please make sure your Fuel master node has Internet access to the repository + before attempting to create a mirror. + + For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-8.0/operations.html#external-ubuntu-ops). + + ' + extra_priority: null + type: custom_repo_configuration + value: + - name: ubuntu + priority: null + section: main universe multiverse + suite: trusty + type: deb + uri: http://ports.ubuntu.com/ + - name: ubuntu-updates + priority: null + section: main universe multiverse + suite: trusty-updates + type: deb + uri: http://ports.ubuntu.com/ + - name: ubuntu-security + priority: null + section: main universe multiverse + suite: trusty-security + type: deb + uri: http://ports.ubuntu.com/ + - name: mos + priority: 1050 + section: main restricted + suite: mos9.0 + type: deb + uri: http://10.20.0.2:8080/mitaka-9.0/ubuntu/x86_64 + - name: mos-updates + priority: 1050 + section: main restricted + suite: mos9.0-updates + type: deb + uri: http://linux.enea.com/mos-repos/ubuntu/9.0 + - name: mos-security + priority: 1050 + section: main restricted + suite: mos9.0-security + type: deb + uri: http://linux.enea.com/mos-repos/ubuntu/9.0 + - name: mos-holdback + priority: 1100 + section: main restricted + suite: mos9.0-holdback + type: deb + uri: http://linux.enea.com/mos-repos/ubuntu/9.0 + - name: Auxiliary + priority: 1150 + section: main restricted + suite: auxiliary + type: deb + uri: http://10.20.0.2:8080/mitaka-9.0/ubuntu/auxiliary + provision: + metadata: + group: general + label: Provision + restrictions: + - action: hide + condition: 'false' + weight: 80 + method: + type: hidden + value: image + packages: + label: Initial packages + type: textarea + value: 'acl + + anacron + + bash-completion + + bridge-utils + + bsdmainutils + + build-essential + + cloud-init + + curl + + daemonize + + debconf-utils + + gdisk + + grub-efi-arm64 + + hpsa-dkms + + hwloc + + i40e-dkms + + linux-firmware + + linux-firmware-nonfree + + linux-headers-generic-lts-xenial + + linux-image-generic-lts-xenial + + lvm2 + + mcollective + + mdadm + + multipath-tools + + multipath-tools-boot + + nailgun-agent + + nailgun-mcagents + + network-checker + + ntp + + openssh-client + + openssh-server + + puppet + + python-amqp + + ruby-augeas + + ruby-ipaddress + + ruby-json + + ruby-netaddr + + ruby-openstack + + ruby-shadow + + ruby-stomp + + telnet + + ubuntu-minimal + + ubuntu-standard + + uuid-runtime + + vim + + virt-what + + vlan + + ' + weight: 10 +wanted_release: Mitaka on Ubuntu 14.04 (aarch64) diff --git a/labs/arm/pod1/fuel/config/dha.yaml b/labs/arm/pod1/fuel/config/dha.yaml new file mode 100644 index 0000000..16757c8 --- /dev/null +++ b/labs/arm/pod1/fuel/config/dha.yaml @@ -0,0 +1,79 @@ +dha-pod-config-metadata: + title: Deployment Hardware Adapter (DHA) + # DHA API version supported + version: 0.0.3 + created: Sat Apr 16 11:34:39 2016 + comment: Enea Armband arm-pod1 DHA (Cavium ThunderX) + +# Adapter to use for this definition +# adapter: [ipmi|libvirt] +adapter: ipmi + +# Node list. +# Mandatory properties are id and role. +# All other properties are adapter specific. +# For Non-Fuel nodes controlled by: +# - ipmi adapter you need to provide: +# pxeMac +# ipmiIp +# ipmiUser +# ipmiPass +# - libvirt adapter you need to provide: +# libvirtName: +# libvirtTemplate: [libvirt/vms/controller.xml | libvirt/vms/compute.xml] +# +# For the Fuel Node you need to provide: +# libvirtName: +# libvirtTemplate: libvirt/vms/fuel.xml +# isFuel: yes +# username: root +# password: r00tme + +nodes: +- id: 1 + ipmiIp: 10.0.1.35 + ipmiPass: admin + ipmiUser: admin + libvirtName: null + libvirtTemplate: null + pxeMac: 68:05:ca:3d:93:0f +- id: 2 + ipmiIp: 10.0.1.32 + ipmiPass: admin + ipmiUser: admin + libvirtName: null + libvirtTemplate: null + pxeMac: 68:05:ca:34:60:e3 +- id: 3 + ipmiIp: 10.0.1.33 + ipmiPass: admin + ipmiUser: admin + libvirtName: null + libvirtTemplate: null + pxeMac: 68:05:ca:3f:7f:f3 +- id: 4 + ipmiIp: 10.0.1.34 + ipmiPass: admin + ipmiUser: admin + libvirtName: null + libvirtTemplate: null + pxeMac: 68:05:ca:3d:93:0c +- id: 5 + ipmiIp: 10.0.1.31 + ipmiPass: admin + ipmiUser: admin + libvirtName: null + libvirtTemplate: null + pxeMac: 68:05:ca:3d:93:14 +# Adding the Fuel node as node id 5 +# which may not be correct - please adjust as needed. +- id: 6 + isFuel: true + libvirtName: armband-pod1 + libvirtTemplate: templates/hardware_environment/vms/enea_lab/fuel.xml + password: r00tme + username: root +disks: + compute: 100G + controller: 100G + fuel: 100G diff --git a/labs/arm/pod1/fuel/config/local_env b/labs/arm/pod1/fuel/config/local_env new file mode 100644 index 0000000..320e7cd --- /dev/null +++ b/labs/arm/pod1/fuel/config/local_env @@ -0,0 +1,3 @@ +export LIBVIRT_DEFAULT_URI=qemu+ssh://jenkins@10.0.2.5/system +export DEFAULT_BRIDGE=admin6_br0,public6_br0 +export DEPLOY_TIMEOUT=360 -- cgit 1.2.3-korg