diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2017-11-03 13:56:55 -0500 |
---|---|---|
committer | Narinder Gupta <narinder.gupta@canonical.com> | 2017-11-07 17:06:26 -0600 |
commit | 34dd0b2e19d2d50486364d18c594c87b77ba078e (patch) | |
tree | 8ed7e69430bced4001274cf9a3deefeedd80aa55 /labconfig | |
parent | 1d9656d5db8d7e55e88e8aaa5ced95dbfdda113d (diff) |
few more fixed for ARM bare metal deployment.
Change-Id: I9cec17471e962bbf161e9fe331b61d5cb10171c8
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'labconfig')
-rw-r--r-- | labconfig/enea/pod5/labconfig.yaml | 96 | ||||
-rw-r--r-- | labconfig/lenovo/pod1/labconfig.yaml | 4 |
2 files changed, 52 insertions, 48 deletions
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 |