diff options
| -rw-r--r-- | ci/deploy.py | 35 | ||||
| -rw-r--r-- | labconfig/intel/pod5/labconfig.yaml | 163 | ||||
| -rw-r--r-- | labconfig/intel/pod6/labconfig.yaml | 227 | ||||
| -rw-r--r-- | labconfig/intel/pod9/labconfig.yaml | 121 | ||||
| -rw-r--r-- | labconfig/orange/pod1/labconfig.yaml | 243 | ||||
| -rw-r--r-- | labconfig/orange/pod2/labconfig.yaml | 265 |
6 files changed, 531 insertions, 523 deletions
diff --git a/ci/deploy.py b/ci/deploy.py index 72002e6f..cfd744d7 100644 --- a/ci/deploy.py +++ b/ci/deploy.py @@ -58,10 +58,13 @@ opnfvcfg['demo-maas']['maas']['apt_sources'].append("ppa:juju/stable") # lets modify the maas general settings: -updns = getFromDict(labcfg, ["labconfig","labsettings","upstream_dns"]) +updns = getFromDict(labcfg, ["lab","racks",0,"dns"]) opnfvcfg["demo-maas"]["maas"]["settings"]["upstream_dns"]=updns -value = getFromDict(labcfg, ["labconfig","lab_location"]) +location = getFromDict(labcfg, ["lab","location"]) +rack = getFromDict(labcfg, ["lab","racks",0,"rack"]) +value=location+rack + opnfvcfg["demo-maas"]["maas"]["settings"]["maas_name"]=value opnfvcfg["demo-maas"]["maas"]["name"]="opnfv-"+value @@ -142,7 +145,7 @@ value = "qemu+ssh://"+getpass.getuser()+"@"+value+"/system" opnfvcfg['demo-maas']['maas']['virsh']['uri']=value opnfvcfg['demo-maas']['maas']['network_config']=ethbrAdm -if len(labcfg["labconfig"]["nodes"]) < 1: +if len(labcfg["lab"]["racks"][0]["nodes"]) < 1: print("looks like virtual deployment where nodes were not defined") opnfvcfg["demo-maas"]["maas"]["nodes"].remove() exit() @@ -150,27 +153,27 @@ if len(labcfg["labconfig"]["nodes"]) < 1: #lets insert the node details here: c=0 # -while c < len(labcfg["labconfig"]["nodes"]): +while c < len(labcfg["lab"]["racks"][0]["nodes"]): valuemac=[] y = 0 # setup value of name and tags accordigly - noderoleslist = labcfg["labconfig"]["nodes"][c]["roles"] + noderoleslist = labcfg["lab"]["racks"][0]["nodes"][c]["roles"] noderoles = " ".join(noderoleslist) - valuetype = getFromDict(labcfg, ["labconfig","nodes",c, "power", "type"]) - namevalue = labcfg["labconfig"]["nodes"][c]["name"] - valuearc = getFromDict(labcfg, ["labconfig","nodes",c, "architecture"]) + valuetype = getFromDict(labcfg, ["lab","racks",0,"nodes",c, "power", "type"]) + namevalue = labcfg["lab"]["racks"][0]["nodes"][c]["name"] + valuearc = getFromDict(labcfg, ["lab","racks",0,"nodes",c, "architecture"]) # setup value of architecture if valuearc == "x86_64": valuearc="amd64/generic" if valuetype == "wakeonlan": - macvalue = getFromDict(labcfg, ["labconfig","nodes",c, "power", "mac_address"]) + macvalue = getFromDict(labcfg, ["lab","racks",0,"nodes",c, "power", "mac_address"]) power={"type": "ether_wake", "mac_address": macvalue} if valuetype == "ipmi": - valueaddr = getFromDict(labcfg, ["labconfig","nodes",c, "power", "address"]) - valueuser = getFromDict(labcfg, ["labconfig","nodes",c, "power", "user"]) - valuepass = getFromDict(labcfg, ["labconfig","nodes",c, "power", "pass"]) + valueaddr = getFromDict(labcfg, ["lab","racks",0,"nodes",c, "power", "address"]) + valueuser = getFromDict(labcfg, ["lab","racks",0,"nodes",c, "power", "user"]) + valuepass = getFromDict(labcfg, ["lab","racks",0,"nodes",c, "power", "pass"]) valuedriver = "LAN_2_0" power={"type": valuetype, "address": valueaddr,"user": valueuser,\ "pass": valuepass, "driver": valuedriver} @@ -179,10 +182,10 @@ while c < len(labcfg["labconfig"]["nodes"]): "architecture":valuearc,"interfaces":[],"mac_addresses":[],\ "power":power,'tags':noderoles}) y = 0 - while y < len(labcfg["labconfig"]["nodes"][c]["nics"]): - valueifname = labcfg["labconfig"]["nodes"][c]["nics"][y]["ifname"] - valueifmac = labcfg["labconfig"]["nodes"][c]["nics"][y]["mac"][0] - valuemac += labcfg["labconfig"]["nodes"][c]["nics"][y]["mac"] + while y < len(labcfg["lab"]["racks"][0]["nodes"][c]["nics"]): + valueifname = labcfg["lab"]["racks"][0]["nodes"][c]["nics"][y]["ifname"] + valueifmac = labcfg["lab"]["racks"][0]["nodes"][c]["nics"][y]["mac"][0] + valuemac += labcfg["lab"]["racks"][0]["nodes"][c]["nics"][y]["mac"] opnfvcfg["demo-maas"]["maas"]["nodes"][c]["interfaces"]\ .append({"name":valueifname,"mac_address":valueifmac,"mode": "auto"}) diff --git a/labconfig/intel/pod5/labconfig.yaml b/labconfig/intel/pod5/labconfig.yaml index 53399495..f671a24b 100644 --- a/labconfig/intel/pod5/labconfig.yaml +++ b/labconfig/intel/pod5/labconfig.yaml @@ -1,83 +1,86 @@ -labconfig: - lab_location: intelpod5 - labsettings: - upstream_dns: 8.8.8.8 +lab: + location: intel + racks: + - rack: pod5 nodes: - - 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 - - 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 - - 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 - - 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 - - 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 - user: root - pass: root + - name: rack-5-m1 + architecture: x86_64 + roles: [network,control] + 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 + - name: rack-5-m2 + architecture: x86_64 + roles: [compute,control,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 + - name: rack-5-m3 + architecture: x86_64 + roles: [compute,control,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 + - name: rack-5-m4 + architecture: x86_64 + roles: [compute,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 + - name: rack-5-m5 + architecture: x86_64 + roles: [compute,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 + 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" + dns: 8.8.8.8 opnfv: release: c distro: trusty @@ -88,9 +91,7 @@ opnfv: storage: - type: ceph disk: /srv - floating-ip-range: feature: odl_l2 - ext-port: eth5 spaces: - type: admin bridge: brAdm diff --git a/labconfig/intel/pod6/labconfig.yaml b/labconfig/intel/pod6/labconfig.yaml index 6a9f8c55..a105133b 100644 --- a/labconfig/intel/pod6/labconfig.yaml +++ b/labconfig/intel/pod6/labconfig.yaml @@ -1,115 +1,116 @@ -labconfig: - lab_location: intelpod6 - labsettings: - upstream_dns: 8.8.8.8 +lab: + location: intel + racks: + - rack: pod6 nodes: - - 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 - - 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 - - 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 - - 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 - - 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 - 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:20" + dns: 8.8.8.8 opnfv: - release: c - distro: trusty - type: nonha - openstack: liberty - 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: + 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/intel/pod9/labconfig.yaml b/labconfig/intel/pod9/labconfig.yaml index 91a5dec4..2defa039 100644 --- a/labconfig/intel/pod9/labconfig.yaml +++ b/labconfig/intel/pod9/labconfig.yaml @@ -1,62 +1,65 @@ -labconfig: - lab_location: intelpod9 - labsettings: - upstream_dns: 8.8.8.8 +lab: + location: intel + racks: + - rack: pod9 nodes: - - name: rack-9-m1 - architecture: x86_64 - roles: [compute,network,storage] - nics: - - ifname: eth3 - spaces: [admin] - mac: ["00:1E:67:D4:30:38"] - - ifname: eth0 - spaces: [data] - mac: ["00:1E:67:C5:5B:08"] - - ifname: eth1 - spaces: [public] - mac: ["00:1E:67:C5:5B:09"] - power: - type: ipmi - address: 10.2.117.142 - user: root - pass: root - - name: rack-9-m2 - architecture: x86_64 - roles: [compute,network,storage] - nics: - - ifname: eth3 - spaces: [admin] - mac: ["00:1E:67:D4:33:A2"] - - ifname: eth0 - spaces: [data] - mac: ["00:1E:67:E2:6C:74"] - - ifname: eth1 - spaces: [public] - mac: ["00:1E:67:E2:6C:75"] - power: - type: ipmi - address: 10.2.117.144 - user: root - pass: root - - name: rack-9-m3 - architecture: x86_64 - roles: [compute,network,storage] - nics: - - ifname: eth3 - spaces: [admin] - mac: ["00:1E:67:D4:2F:BA"] - - ifname: eth0 - spaces: [data] - mac: ["00:1E:67:C5:5B:00"] - - ifname: eth1 - spaces: [public] - mac: ["00:1E:67:C5:5B:01"] - power: - type: ipmi - address: 10.2.117.146 - user: root - pass: root + - name: rack-9-m1 + architecture: x86_64 + roles: [network,control] + nics: + - ifname: eth3 + spaces: [admin] + mac: ["00:1E:67:D4:30:38"] + - ifname: eth0 + spaces: [data] + mac: ["00:1E:67:C5:5B:08"] + - ifname: eth1 + spaces: [public] + mac: ["00:1E:67:C5:5B:09"] + power: + type: ipmi + address: 10.2.117.142 + user: root + pass: root + - name: rack-9-m2 + architecture: x86_64 + roles: [compute,control,storage] + nics: + - ifname: eth3 + spaces: [admin] + mac: ["00:1E:67:D4:33:A2"] + - ifname: eth0 + spaces: [data] + mac: ["00:1E:67:E2:6C:74"] + - ifname: eth1 + spaces: [public] + mac: ["00:1E:67:E2:6C:75"] + power: + type: ipmi + address: 10.2.117.144 + user: root + pass: root + - name: rack-9-m3 + architecture: x86_64 + roles: [compute,control,storage] + nics: + - ifname: eth3 + spaces: [admin] + mac: ["00:1E:67:D4:2F:BA"] + - ifname: eth0 + spaces: [data] + mac: ["00:1E:67:C5:5B:00"] + - ifname: eth1 + spaces: [public] + mac: ["00:1E:67:C5:5B:01"] + power: + type: ipmi + address: 10.2.117.146 + user: root + pass: root + floating-ip-range: 10.9.15.6,10.9.15.250,10.9.15.254,10.9.15.0/24 + ext-port: "00:1E:67:C5:5B:09" + dns: 8.8.8.8 opnfv: release: c distro: trusty @@ -67,9 +70,7 @@ opnfv: storage: - type: ceph disk: /srv - floating-ip-range: feature: odl_l2 - ext-port: eth5 spaces: - type: admin bridge: brAdm diff --git a/labconfig/orange/pod1/labconfig.yaml b/labconfig/orange/pod1/labconfig.yaml index 89ff1163..29532733 100644 --- a/labconfig/orange/pod1/labconfig.yaml +++ b/labconfig/orange/pod1/labconfig.yaml @@ -1,123 +1,124 @@ -labconfig: - lab_location: orangepod1 - labsettings: - upstream_dns: 192.168.1.1 +lab: + location: orange + racks: + - rack: pod1 nodes: - - name: rack-1-m1 - architecture: x86_64 - roles: [compute,storage] - nics: - - ifname: eth0 - spaces: [admin] - mac: ["68:b5:99:74:e3:a8"] - - ifname: eth2 - spaces: [data] - mac: ["68:b5:99:74:e3:ae"] - - ifname: eth3 - spaces: [storage] - mac: ["68:b5:99:74:e3:ac"] - power: - type: ipmi - address: 192.168.1.11 - user: Administrator - pass: pod2Admin - - name: rack-1-m2 - architecture: x86_64 - roles: [compute,storage] - nics: - - ifname: eth0 - spaces: [admin] - mac: ["68:b5:99:75:05:5e"] - - ifname: eth2 - spaces: [data] - mac: ["68:b5:99:75:05:64"] - - ifname: eth3 - spaces: [storage] - mac: ["68:b5:99:75:05:62"] - power: - type: ipmi - address: 192.168.1.12 - user: Administrator - pass: pod2Admin: - - name: rack-1-m3 - architecture: x86_64 - roles: [compute,storage] - nics: - - ifname: eth0 - spaces: [admin] - mac: ["94:57:a5:52:53:7c"] - - ifname: eth3 - spaces: [data] - mac: ["94:57:a5:52:53:7f"] - - ifname: eth2 - spaces: [storage] - mac: ["94:57:a5:52:53:7e"] - power: - type: ipmi - address: 192.168.1.13 - user: Administrator - pass: pod2Admin - - name: rack-1-m4 - architecture: x86_64 - roles: [compute,storage] - nics: - - ifname: eth0 - spaces: [admin] - mac: ["94:57:a5:52:c1:54"] - - ifname: eth3 - spaces: [data] - mac: ["94:57:a5:52:c1:57"] - - ifname: eth2 - spaces: [storage] - mac: ["94:57:a5:52:c1:56"] - power: - type: ipmi - address: 192.168.1.14 - user: Administrator - pass: pod2Admin - - name: rack-1-m5 - architecture: x86_64 - roles: [network] - nics: - - ifname: eth0 - spaces: [admin] - mac: ["94:57:a5:52:c1:d8"] - - ifname: eth3 - spaces: [data] - mac: ["94:57:a5:52:c1:db"] - - ifname: eth2 - spaces: [storage] - mac: ["94:57:a5:52:c1:da"] - power: - type: ipmi - address: 192.168.1.15 - user: Administrator - pass: pod2Admin + - name: rack-1-m1 + architecture: x86_64 + roles: [compute,control,storage] + nics: + - ifname: eth0 + spaces: [admin] + mac: ["68:b5:99:74:e3:a8"] + - ifname: eth2 + spaces: [data] + mac: ["68:b5:99:74:e3:ae"] + - ifname: eth3 + spaces: [storage] + mac: ["68:b5:99:74:e3:ac"] + power: + type: ipmi + address: 192.168.1.11 + user: Administrator + pass: pod2Admin + - name: rack-1-m2 + architecture: x86_64 + roles: [control,network] + nics: + - ifname: eth0 + spaces: [admin] + mac: ["68:b5:99:75:05:5e"] + - ifname: eth2 + spaces: [data] + mac: ["68:b5:99:75:05:64"] + - ifname: eth3 + spaces: [storage] + mac: ["68:b5:99:75:05:62"] + power: + type: ipmi + address: 192.168.1.12 + user: Administrator + pass: pod2Admin: + - name: rack-1-m3 + architecture: x86_64 + roles: [compute,control,storage] + nics: + - ifname: eth0 + spaces: [admin] + mac: ["94:57:a5:52:53:7c"] + - ifname: eth3 + spaces: [data] + mac: ["94:57:a5:52:53:7f"] + - ifname: eth2 + spaces: [storage] + mac: ["94:57:a5:52:53:7e"] + power: + type: ipmi + address: 192.168.1.13 + user: Administrator + pass: pod2Admin + - name: rack-1-m4 + architecture: x86_64 + roles: [compute,storage] + nics: + - ifname: eth0 + spaces: [admin] + mac: ["94:57:a5:52:c1:54"] + - ifname: eth3 + spaces: [data] + mac: ["94:57:a5:52:c1:57"] + - ifname: eth2 + spaces: [storage] + mac: ["94:57:a5:52:c1:56"] + power: + type: ipmi + address: 192.168.1.14 + user: Administrator + pass: pod2Admin + - name: rack-1-m5 + architecture: x86_64 + roles: [network] + nics: + - ifname: eth0 + spaces: [admin] + mac: ["94:57:a5:52:c1:d8"] + - ifname: eth3 + spaces: [data] + mac: ["94:57:a5:52:c1:db"] + - ifname: eth2 + spaces: [storage] + mac: ["94:57:a5:52:c1:da"] + power: + type: ipmi + address: 192.168.1.15 + 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: "68:b5:99:75:05:60" + dns: 192.168.1.1 opnfv: - release: c - distro: trusty - type: nonha - openstack: liberty - sdncontroller: - - type: nosdn - storage: - - type: ceph - disk: /dev/sdb /dev/sdc - floating-ip-range: - feature: odl_l2 - ext-port: eth1 - spaces: - - type: admin - bridge: brAdm - cidr: 192.168.1.0/24 - gateway: 192.168.1.1 - vlan: - - type: data - bridge: brData - cidr: 192.168.11.0/24 - gateway: - vlan: - - type: storage - bridge: brStorage - cidr: 192.168.21.0/24 - gateway: + release: c + distro: trusty + type: nonha + openstack: liberty + sdncontroller: + - type: nosdn + storage: + - type: ceph + disk: /dev/sdb /dev/sdc + feature: odl_l2 + spaces: + - type: admin + bridge: brAdm + cidr: 192.168.1.0/24 + gateway: 192.168.1.1 + vlan: + - type: data + bridge: brData + cidr: 192.168.11.0/24 + gateway: + vlan: + - type: storage + bridge: brStorage + cidr: 192.168.21.0/24 + gateway: diff --git a/labconfig/orange/pod2/labconfig.yaml b/labconfig/orange/pod2/labconfig.yaml index 3193b8bc..95301dda 100644 --- a/labconfig/orange/pod2/labconfig.yaml +++ b/labconfig/orange/pod2/labconfig.yaml @@ -1,134 +1,137 @@ -labconfig: - lab_location: orangepod2 - labsettings: - upstream_dns: 192.168.2.1 +lab: + location: orange + racks: + - rack: pod2 nodes: - - name: rack-2-m1 - architecture: x86_64 - roles: [compute,storage] - nics: - - ifname: eth0 - spaces: [admin] - mac: ["38:63:bb:3f:bc:c8"] - - ifname: eth5 - spaces: [data] - mac: ["a0:36:9f:4e:88:5e"] - - ifname: eth4 - spaces: [storage] - mac: ["a0:36:9f:4e:88:5c"] - power: - type: ipmi - address: 192.168.2.11 - user: Administrator - pass: pod2Admin - - name: rack-2-m2 - architecture: x86_64 - roles: [compute,storage] - nics: - - ifname: eth0 - spaces: [admin] - mac: ["38:63:bb:44:34:84"] - - ifname: eth5 - spaces: [data] - mac: ["a0:36:9f:4e:8b:0e"] - - ifname: eth4 - spaces: [storage] - mac: ["a0:36:9f:4e:8b:0c"] - power: - type: ipmi - address: 192.168.2.12 - user: Administrator - pass: pod2Admin - - name: rack-2-m3 - architecture: x86_64 - roles: [compute,storage] - nics: - - ifname: eth0 - spaces: [admin] - mac: ["38:63:bb:3f:1d:8c"] - - ifname: eth5 - spaces: [data] - mac: ["a0:36:9f:4e:88:3a"] - - ifname: eth4 - spaces: [storage] - mac: ["a0:36:9f:4e:88:38"] - power: - type: ipmi - address: 192.168.2.13 - user: Administrator - pass: pod2Admin - - name: rack-2-m4 - architecture: x86_64 - roles: [compute,storage] - nics: - - ifname: eth0 - spaces: [admin] - mac: ["38:63:bb:3f:2d:a8"] - - ifname: eth5 - spaces: [data] - mac: ["a0:36:9f:4e:8b:18"] - - ifname: eth4 - spaces: [storage] - mac: ["a0:36:9f:4e:8b:1a"] - power: - type: ipmi - address: 192.168.2.14 - user: Administrator - pass: pod2Admin - - name: rack-2-m5 - architecture: x86_64 - roles: [network] - nics: - - ifname: eth0 - spaces: [admin] - mac: ["94:57:a5:52:c9:48"] - - ifname: eth3 - spaces: [data] - mac: ["94:57:a5:52:c9:4b"] - - ifname: eth2 - spaces: [storage] - mac: ["94:57:a5:52:c9:4a"] - power: - type: ipmi - address: 192.168.2.15 - user: Administrator - pass: pod2Admin - - name: rack-2-m6 - architecture: x86_64 - roles: [network] - nics: - - ifname: eth0 - spaces: [admin] - mac: ["94:57:a5:52:63:b0"] - - ifname: eth3 - spaces: [data] - mac: ["94:57:a5:52:63:b3"] - - ifname: eth2 - spaces: [storage] - mac: ["94:57:a5:52:63:b2"] - power: - type: ipmi - address: 192.168.2.16 - user: Administrator - pass: pod2Admin - - name: rack-2-m7 - architecture: x86_64 - roles: [network] - nics: - - ifname: eth0 - spaces: [admin] - mac: ["94:57:a5:52:f1:80"] - - ifname: eth3 - spaces: [data] - mac: ["94:57:a5:52:f1:83"] - - ifname: eth2 - spaces: [storage] - mac: ["94:57:a5:52:f1:82"] - power: - type: ipmi - address: 192.168.2.17 - user: Administrator - pass: pod2Admin + - name: rack-2-m1 + architecture: x86_64 + roles: [compute,storage] + nics: + - ifname: eth0 + spaces: [admin] + mac: ["38:63:bb:3f:bc:c8"] + - ifname: eth5 + spaces: [data] + mac: ["a0:36:9f:4e:88:5e"] + - ifname: eth4 + spaces: [storage] + mac: ["a0:36:9f:4e:88:5c"] + power: + type: ipmi + address: 192.168.2.11 + user: Administrator + pass: pod2Admin + - name: rack-2-m2 + architecture: x86_64 + roles: [compute,storage] + nics: + - ifname: eth0 + spaces: [admin] + mac: ["38:63:bb:44:34:84"] + - ifname: eth5 + spaces: [data] + mac: ["a0:36:9f:4e:8b:0e"] + - ifname: eth4 + spaces: [storage] + mac: ["a0:36:9f:4e:8b:0c"] + power: + type: ipmi + address: 192.168.2.12 + user: Administrator + pass: pod2Admin + - name: rack-2-m3 + architecture: x86_64 + roles: [compute,storage] + nics: + - ifname: eth0 + spaces: [admin] + mac: ["38:63:bb:3f:1d:8c"] + - ifname: eth5 + spaces: [data] + mac: ["a0:36:9f:4e:88:3a"] + - ifname: eth4 + spaces: [storage] + mac: ["a0:36:9f:4e:88:38"] + power: + type: ipmi + address: 192.168.2.13 + user: Administrator + pass: pod2Admin + - name: rack-2-m4 + architecture: x86_64 + roles: [compute,storage] + nics: + - ifname: eth0 + spaces: [admin] + mac: ["38:63:bb:3f:2d:a8"] + - ifname: eth5 + spaces: [data] + mac: ["a0:36:9f:4e:8b:18"] + - ifname: eth4 + spaces: [storage] + mac: ["a0:36:9f:4e:8b:1a"] + power: + type: ipmi + address: 192.168.2.14 + user: Administrator + pass: pod2Admin + - name: rack-2-m5 + architecture: x86_64 + roles: [network,control] + nics: + - ifname: eth0 + spaces: [admin] + mac: ["94:57:a5:52:c9:48"] + - ifname: eth3 + spaces: [data] + mac: ["94:57:a5:52:c9:4b"] + - ifname: eth2 + spaces: [storage] + mac: ["94:57:a5:52:c9:4a"] + power: + type: ipmi + address: 192.168.2.15 + user: Administrator + pass: pod2Admin + - name: rack-2-m6 + architecture: x86_64 + roles: [control,compute] + nics: + - ifname: eth0 + spaces: [admin] + mac: ["94:57:a5:52:63:b0"] + - ifname: eth3 + spaces: [data] + mac: ["94:57:a5:52:63:b3"] + - ifname: eth2 + spaces: [storage] + mac: ["94:57:a5:52:63:b2"] + power: + type: ipmi + address: 192.168.2.16 + user: Administrator + pass: pod2Admin + - name: rack-2-m7 + architecture: x86_64 + roles: [control,compute] + nics: + - ifname: eth0 + spaces: [admin] + mac: ["94:57:a5:52:f1:80"] + - ifname: eth3 + spaces: [data] + mac: ["94:57:a5:52:f1:83"] + - ifname: eth2 + spaces: [storage] + mac: ["94:57:a5:52:f1:82"] + power: + type: ipmi + address: 192.168.2.17 + 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" + dns: 192.168.2.1 opnfv: release: c distro: trusty @@ -139,9 +142,7 @@ opnfv: storage: - type: ceph disk: /dev/sdb /dev/sdc - floating-ip-range: feature: odl_l2 - ext-port: eth1 spaces: - type: admin bridge: brAdm |