summaryrefslogtreecommitdiffstats
path: root/labconfig
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-06-06 15:19:31 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-06-07 01:10:42 -0500
commitaca4784eacb9b27e8640b90af3edbebea96aa39f (patch)
tree5680843411f98ffb6a97d2b2940cf0b8bb4293a5 /labconfig
parentcb56a154c5bd3817af14eaddfb7b45b76b6dc30a (diff)
added the labconfig file for att virpod1. Remove the mac
as it gateway br-ex was not configured with MAC. Change-Id: I32769c8d03dded073889a08d364c7bd3936880d3 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'labconfig')
-rw-r--r--labconfig/att/virpod1/labconfig.yaml45
-rw-r--r--labconfig/intel/pod5/labconfig.yaml2
-rw-r--r--labconfig/intel/pod6/labconfig.yaml2
-rw-r--r--labconfig/labconfig.yaml193
-rw-r--r--labconfig/orange/pod1/labconfig.yaml2
-rw-r--r--labconfig/orange/pod2/labconfig.yaml2
6 files changed, 163 insertions, 83 deletions
diff --git a/labconfig/att/virpod1/labconfig.yaml b/labconfig/att/virpod1/labconfig.yaml
new file mode 100644
index 00000000..1bc27aff
--- /dev/null
+++ b/labconfig/att/virpod1/labconfig.yaml
@@ -0,0 +1,45 @@
+lab:
+ location: att
+ racks:
+ - rack: virpod1
+ nodes:
+ - name: rack-1-m1
+ architecture: x86_64
+ roles: [network,control]
+ nics:
+ - ifname: eth0
+ spaces: [admin]
+ mac: ["00:1e:67:d8:ba:46"]
+ power:
+ type: wakeonlan
+ mac_address: 00:1e:67:d8:ba:46
+ - name: rack-1-m2
+ architecture: x86_64
+ roles: [compute,control,storage]
+ nics:
+ - ifname: eth0
+ spaces: [admin]
+ mac: ["00:1e:67:e0:0b:72"]
+ power:
+ type: wakeonlan
+ mac_address: 00:1e:67:e0:0b:72
+ floating-ip-range: 192.168.10.6,192.168.10.49,192.168.10.1,192.168.10.0/24
+ ext-port: "90:E2:BA:83:FD:21,90:E2:BA:75:30:F5"
+ dns: 8.8.8.8
+opnfv:
+ release: c
+ distro: trusty
+ type: nonha
+ openstack: mitaka
+ sdncontroller:
+ - type: nosdn
+ storage:
+ - type: ceph
+ disk: /srv
+ feature: odl_l2
+ spaces:
+ - type: admin
+ bridge: brAdm
+ cidr: 192.168.10.0/24
+ gateway: 192.168.10.1
+ vlan:
diff --git a/labconfig/intel/pod5/labconfig.yaml b/labconfig/intel/pod5/labconfig.yaml
index f1758c1a..e7f8c0d0 100644
--- a/labconfig/intel/pod5/labconfig.yaml
+++ b/labconfig/intel/pod5/labconfig.yaml
@@ -79,7 +79,7 @@ lab:
user: root
pass: root
floating-ip-range: 10.5.15.6,10.5.15.250,10.5.15.254,10.5.15.0/24
- ext-port: "90:E2:BA:85:4E:2D,90:E2:BA:84:08:B9,90:E2:BA:84:07:0E,90:E2:BA:83:FD:81,90:E2:BA:75:22:75"
+ ext-port: "eth5"
dns: 8.8.8.8
opnfv:
release: c
diff --git a/labconfig/intel/pod6/labconfig.yaml b/labconfig/intel/pod6/labconfig.yaml
index 0b9b266b..f3ff6db0 100644
--- a/labconfig/intel/pod6/labconfig.yaml
+++ b/labconfig/intel/pod6/labconfig.yaml
@@ -79,7 +79,7 @@ lab:
user: root
pass: root
floating-ip-range: 10.6.15.6,10.6.15.250,10.6.15.254,10.6.15.0/24
- ext-port: "90:E2:BA:83:FD:21,90:E2:BA:75:30:F5,90:E2:BA:83:FE:75,90:E2:BA:84:15:7D,90:E2:BA:84:08:F5"
+ ext-port: "eth5"
dns: 8.8.8.8
opnfv:
release: c
diff --git a/labconfig/labconfig.yaml b/labconfig/labconfig.yaml
index 52775d78..0b9b266b 100644
--- a/labconfig/labconfig.yaml
+++ b/labconfig/labconfig.yaml
@@ -1,81 +1,116 @@
-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
+lab:
+ location: intel
+ racks:
+ - rack: pod6
nodes:
- - type: control
- architecture: x86_64
- pxe_mac_address:
- - "00:1e:67:d8:ba:46"
- 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"
- 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"
- 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"
- 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"
- power:
- type: ipmi
- address: 10.2.117.100
- user: root
- pass: root
+ - name: rack-6-m1
+ architecture: x86_64
+ roles: [network,control]
+ 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
+ - name: rack-6-m2
+ architecture: x86_64
+ roles: [compute,control,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
+ - name: rack-6-m3
+ architecture: x86_64
+ roles: [compute,control,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
+ - name: rack-6-m4
+ architecture: x86_64
+ roles: [compute,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
+ - name: rack-6-m5
+ architecture: x86_64
+ roles: [compute,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
+ user: root
+ pass: root
+ floating-ip-range: 10.6.15.6,10.6.15.250,10.6.15.254,10.6.15.0/24
+ ext-port: "90:E2:BA:83:FD:21,90:E2:BA:75:30:F5,90:E2:BA:83:FE:75,90:E2:BA:84:15:7D,90:E2:BA:84:08:F5"
+ dns: 8.8.8.8
opnfv:
- release: c
- distro: trusty
- type: nonha
- openstack: liberty
- sdncontroller:
- - type: nosdn
- storage:
- - type: ceph
- disk: sda,sdb
- floating-ip-range:
- feature: odl_l2
- ext-port: eth0
+ release: c
+ distro: trusty
+ type: nonha
+ openstack: liberty
+ sdncontroller:
+ - type: nosdn
+ storage:
+ - type: ceph
+ disk: /srv
+ feature: odl_l2
+ 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:
diff --git a/labconfig/orange/pod1/labconfig.yaml b/labconfig/orange/pod1/labconfig.yaml
index 76cd74aa..b8445528 100644
--- a/labconfig/orange/pod1/labconfig.yaml
+++ b/labconfig/orange/pod1/labconfig.yaml
@@ -94,7 +94,7 @@ lab:
user: Administrator
pass: pod1Admin
floating-ip-range: 161.105.231.2,161.105.231.62,161.105.231.1,161.105.231.0/26
- ext-port: "68:b5:99:75:05:60"
+ ext-port: "eth1"
dns: 192.168.1.1
opnfv:
release: c
diff --git a/labconfig/orange/pod2/labconfig.yaml b/labconfig/orange/pod2/labconfig.yaml
index 95301dda..9b2aa87b 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: "94:57:a5:52:c9:49"
+ ext-port: "eth1"
dns: 192.168.2.1
opnfv:
release: c