From d17896f8f943ac15ed333633bcb68247d122c1ce Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Thu, 26 May 2016 14:14:56 -0500 Subject: ymodfiied to include marks comment for labconfig for intel pod6. Change-Id: I2265e3063c786ad36c1fce0d139cee40b4a2875e Signed-off-by: Narinder Gupta --- labconfig/intel/pod5/labconfig.yaml | 124 +++++++++++++++++++++++------------- labconfig/intel/pod6/labconfig.yaml | 124 +++++++++++++++++++++++------------- 2 files changed, 158 insertions(+), 90 deletions(-) (limited to 'labconfig/intel') diff --git a/labconfig/intel/pod5/labconfig.yaml b/labconfig/intel/pod5/labconfig.yaml index a2d1cadd..53399495 100644 --- a/labconfig/intel/pod5/labconfig.yaml +++ b/labconfig/intel/pod5/labconfig.yaml @@ -1,66 +1,78 @@ labconfig: lab_location: intelpod5 - bridges: - - type: admin - bridge: brAdm - cidr: 10.5.1.0/24 - gateway: 10.5.1.1 - - type: data - bridge: brData - cidr: 10.5.12.0/24 - gateway: - - type: public - bridge: brPublic - cidr: 10.5.15.0/24 - gateway: 10.5.15.254 - - type: external - bridge: brExt - cidr: - gateway: - ipaddress: 10.2.117.92 labsettings: upstream_dns: 8.8.8.8 nodes: - - type: control - architecture: x86_64 - pxe_mac_address: - - "00:1e:67:cf:bb:54" + - name: rack-5-m1 + architecture: x86_64 + roles: [compute,network,storage] + nics: + - ifname: eth1 + spaces: [admin] + mac: ["00:1E:67:CF:BB:54"] + - ifname: eth4 + spaces: [data] + mac: ["90:E2:BA:85:4E:2C"] power: type: ipmi address: 10.2.117.81 user: root pass: root - - type: control - architecture: x86_64 - pxe_mac_address: - - "00:1e:67:cf:b8:93" + - name: rack-5-m2 + architecture: x86_64 + roles: [compute,network,storage] + nics: + - ifname: eth1 + spaces: [admin] + mac: ["00:1E:67:CF:B8:93"] + - ifname: eth4 + spaces: [data] + mac: ["90:E2:BA:84:08:B8"] power: type: ipmi address: 10.2.117.82 user: root pass: root - - type: control - architecture: x86_64 - pxe_mac_address: - - "00:1e:67:e0:08:7f" + - name: rack-5-m3 + architecture: x86_64 + roles: [compute,network,storage] + nics: + - ifname: eth1 + spaces: [admin] + mac: ["00:1E:67:E0:08:7F"] + - ifname: eth4 + spaces: [data] + mac: ["90:E2:BA:84:07:0D"] power: type: ipmi address: 10.2.117.83 user: root pass: root - - type: compute - architecture: x86_64 - pxe_mac_address: - - "00:1e:67:e0:08:b1" + - name: rack-5-m4 + architecture: x86_64 + roles: [compute,network,storage] + nics: + - ifname: eth1 + spaces: [admin] + mac: ["00:1E:67:E0:08:B1"] + - ifname: eth4 + spaces: [data] + mac: ["90:E2:BA:83:FD:80"] power: type: ipmi address: 10.2.117.84 user: root pass: root - - type: compute - architecture: x86_64 - pxe_mac_address: - - "00:1e:67:e0:0a:4b" + - name: rack-5-m5 + architecture: x86_64 + roles: [compute,network,storage] + nics: + - ifname: eth1 + spaces: [admin] + mac: ["00:1E:67:E0:0A:4B"] + - ifname: eth4 + spaces: [data] + mac: ["90:E2:BA:75:22:74"] power: type: ipmi address: 10.2.117.85 @@ -71,11 +83,33 @@ opnfv: distro: trusty type: nonha openstack: liberty - sdncontroller: - - type: nosdn - storage: - - type: ceph - disk: /srv/osd - floating-ip-range: - feature: odl_l2 + sdncontroller: + - type: nosdn + storage: + - type: ceph + disk: /srv + floating-ip-range: + feature: odl_l2 ext-port: eth5 + spaces: + - type: admin + bridge: brAdm + cidr: 10.5.1.0/24 + gateway: 10.5.1.1 + vlan: + - type: data + bridge: brData + cidr: 10.5.12.0/24 + gateway: + vlan: + - type: public + bridge: brPublic + cidr: 10.5.15.0/24 + gateway: 10.5.15.254 + vlan: + - type: external + bridge: brExt + cidr: + gateway: + ipaddress: 10.2.117.86 + vlan: diff --git a/labconfig/intel/pod6/labconfig.yaml b/labconfig/intel/pod6/labconfig.yaml index a1cdd73b..6a9f8c55 100644 --- a/labconfig/intel/pod6/labconfig.yaml +++ b/labconfig/intel/pod6/labconfig.yaml @@ -1,66 +1,78 @@ labconfig: lab_location: intelpod6 - bridges: - - type: admin - bridge: brAdm - cidr: 10.6.1.0/24 - gateway: 10.6.1.1 - - type: data - bridge: brData - cidr: 10.6.12.0/24 - gateway: - - type: public - bridge: brPublic - cidr: 10.6.15.0/24 - gateway: 10.6.15.254 - - type: external - bridge: brExt - cidr: - gateway: - ipaddress: 10.2.117.107 labsettings: upstream_dns: 8.8.8.8 nodes: - - type: control - architecture: x86_64 - pxe_mac_address: - - "00:1e:67:d8:ba:46" + - name: rack-6-m1 + architecture: x86_64 + roles: [compute,network,storage] + nics: + - ifname: eth1 + spaces: [admin] + mac: ["00:1e:67:d8:ba:46"] + - ifname: eth4 + spaces: [data] + mac: ["90:E2:BA:83:FD:20"] power: type: ipmi address: 10.2.117.96 user: root pass: root - - type: control - architecture: x86_64 - pxe_mac_address: - - "00:1e:67:e0:0b:72" + - name: rack-6-m2 + architecture: x86_64 + roles: [compute,network,storage] + nics: + - ifname: eth1 + spaces: [admin] + mac: ["00:1e:67:e0:0b:72"] + - ifname: eth4 + spaces: [data] + mac: ["90:E2:BA:75:30:F4"] power: type: ipmi address: 10.2.117.97 user: root pass: root - - type: control - architecture: x86_64 - pxe_mac_address: - - "00:1e:67:e0:09:33" + - name: rack-6-m3 + architecture: x86_64 + roles: [compute,network,storage] + nics: + - ifname: eth1 + spaces: [admin] + mac: ["00:1e:67:e0:09:33"] + - ifname: eth4 + spaces: [data] + mac: ["90:E2:BA:83:FE:74"] power: type: ipmi address: 10.2.117.98 user: root pass: root - - type: compute - architecture: x86_64 - pxe_mac_address: - - "00:1e:67:e0:09:fb" + - name: rack-6-m4 + architecture: x86_64 + roles: [compute,network,storage] + nics: + - ifname: eth1 + spaces: [admin] + mac: ["00:1e:67:e0:09:fb"] + - ifname: eth4 + spaces: [data] + mac: ["90:E2:BA:84:15:7C"] power: type: ipmi address: 10.2.117.99 user: root pass: root - - type: compute - architecture: x86_64 - pxe_mac_address: - - "00:1e:67:cf:bc:f8" + - name: rack-6-m5 + architecture: x86_64 + roles: [compute,network,storage] + nics: + - ifname: eth1 + spaces: [admin] + mac: ["00:1e:67:cf:bc:f8"] + - ifname: eth4 + spaces: [data] + mac: ["90:E2:BA:84:08:F4"] power: type: ipmi address: 10.2.117.100 @@ -71,11 +83,33 @@ opnfv: distro: trusty type: nonha openstack: liberty - sdncontroller: - - type: nosdn - storage: - - type: ceph - disk: sda,sdb - floating-ip-range: - feature: odl_l2 + sdncontroller: + - type: nosdn + storage: + - type: ceph + disk: /srv + floating-ip-range: + feature: odl_l2 ext-port: eth5 + spaces: + - type: admin + bridge: brAdm + cidr: 10.6.1.0/24 + gateway: 10.6.1.1 + vlan: + - type: data + bridge: brData + cidr: 10.6.12.0/24 + gateway: + vlan: + - type: public + bridge: brPublic + cidr: 10.6.15.0/24 + gateway: 10.6.15.254 + vlan: + - type: external + bridge: brExt + cidr: + gateway: + ipaddress: 10.2.117.107 + vlan: -- cgit 1.2.3-korg