diff options
| -rwxr-xr-x | ci/02-maasdeploy.sh | 14 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | 2 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml | 2 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-nonha.yaml | 2 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 2 | ||||
| -rw-r--r-- | labconfig/intel/pod9/labconfig.yaml | 107 | ||||
| -rw-r--r-- | labconfig/orange/pod1/labconfig.yaml | 121 | ||||
| -rw-r--r-- | labconfig/orange/pod2/labconfig.yaml | 146 |
8 files changed, 264 insertions, 132 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index ff006768..741773d1 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -257,17 +257,15 @@ case "$labname" in ;; 'orangepod1' ) maas refresh - enableautomodebyname eth2 DHCP "192.168.21.0/24" compute || true - enableautomodebyname eth3 AUTO "192.168.11.0/24" compute || true - enableautomodebyname eth2 DHCP "192.168.21.0/24" control || true - enableautomodebyname eth3 AUTO "192.168.11.0/24" control || true + enableautomode eth2 DHCP "192.168.21.0/24" || true + enableautomode eth3 AUTO "192.168.11.0/24" || true ;; 'orangepod2' ) maas refresh - enableautomodebyname eth4 DHCP "192.168.22.0/24" compute || true - enableautomodebyname eth5 AUTO "192.168.12.0/24" compute || true - enableautomodebyname eth2 DHCP "192.168.22.0/24" control || true - enableautomodebyname eth3 AUTO "192.168.12.0/24" control || true + enableautomode eth4 DHCP "192.168.22.0/24" || true + enableautomode eth2 DHCP "192.168.22.0/24" || true + enableautomode eth5 AUTO "192.168.12.0/24" || true + enableautomode eth3 AUTO "192.168.12.0/24" || true ;; 'attvirpod1' ) enableautomodebyname eth1 AUTO "192.168.10.0/24" control || true diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml index 647a1019..7b945e3c 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml @@ -112,14 +112,12 @@ openstack-phase2: - "lxc:nodes=1" nova-compute: charm: "local:trusty/nova-compute" - num_units: 2 options: enable-live-migration: true enable-resize: true manage-neutron-plugin-legacy-mode: false migration-auth-type: ssh to: - - "nodes=0" - "nodes=1" openstack-dashboard: charm: "local:trusty/openstack-dashboard" diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml index 0ea197d5..309da777 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml @@ -96,7 +96,6 @@ openstack-phase2: - "lxc:nodes=0" nova-compute: charm: local:trusty/nova-compute - num_units: 2 options: openstack-origin-git: include-file://nova-master.yaml enable-live-migration: true @@ -104,7 +103,6 @@ openstack-phase2: manage-neutron-plugin-legacy-mode: false migration-auth-type: ssh to: - - "nodes=0" - "nodes=1" nova-cloud-controller: charm: "local:trusty/nova-cloud-controller" diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml index a4d0ba12..3a5d4c02 100644 --- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml @@ -95,14 +95,12 @@ openstack-phase2: - "lxc:nodes=1" nova-compute: charm: local:trusty/nova-compute - num_units: 2 options: enable-live-migration: true enable-resize: true manage-neutron-plugin-legacy-mode: false migration-auth-type: ssh to: - - "nodes=0" - "nodes=1" nova-cloud-controller: charm: local:trusty/nova-cloud-controller diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index 49ae7a62..e4129315 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -98,7 +98,6 @@ openstack-phase2: - "lxc:nodes=0" nova-compute: charm: local:trusty/nova-compute - num_units: 2 options: openstack-origin-git: include-file://nova-master.yaml enable-live-migration: true @@ -106,7 +105,6 @@ openstack-phase2: manage-neutron-plugin-legacy-mode: false migration-auth-type: ssh to: - - "nodes=0" - "nodes=1" nova-cloud-controller: charm: local:trusty/nova-cloud-controller diff --git a/labconfig/intel/pod9/labconfig.yaml b/labconfig/intel/pod9/labconfig.yaml index 2f0b72e2..91a5dec4 100644 --- a/labconfig/intel/pod9/labconfig.yaml +++ b/labconfig/intel/pod9/labconfig.yaml @@ -1,48 +1,57 @@ labconfig: lab_location: intelpod9 - bridges: - - type: admin - bridge: brAdm - cidr: 10.9.1.0/24 - gateway: 10.9.1.1 - - type: data - bridge: brData - cidr: 10.9.12.0/24 - gateway: - - type: public - bridge: brPublic - cidr: 10.9.15.0/24 - gateway: 10.9.15.254 - - type: external - bridge: brExt - cidr: - gateway: - ipaddress: 10.2.117.143 labsettings: upstream_dns: 8.8.8.8 nodes: - - type: control - architecture: x86_64 - pxe_mac_address: - - "00:1E:67:D4:30:38" + - 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 - - type: compute - architecture: x86_64 - pxe_mac_address: - - "00:1E:67:D4:33:A3" + - 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 - - type: compute - architecture: x86_64 - pxe_mac_address: - - "00:1E:67:D4:2F:BA" + - 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 @@ -53,11 +62,33 @@ opnfv: distro: trusty type: nonha openstack: liberty - sdncontroller: - - type: nosdn - storage: - - type: ceph - disk: sda,sdb - floating-ip-range: - feature: odl_l2 - ext-port: eth0 + sdncontroller: + - type: nosdn + storage: + - type: ceph + disk: /srv + floating-ip-range: + feature: odl_l2 + ext-port: eth5 + spaces: + - type: admin + bridge: brAdm + cidr: 10.9.1.0/24 + gateway: 10.9.1.1 + vlan: 901 + - type: data + bridge: brData + cidr: 10.9.12.0/24 + gateway: + vlan: 902 + - type: public + bridge: brPublic + cidr: 10.9.15.0/24 + gateway: 10.9.15.254 + vlan: 905 + - type: external + bridge: brExt + cidr: + gateway: + ipaddress: 10.2.117.143 + vlan: diff --git a/labconfig/orange/pod1/labconfig.yaml b/labconfig/orange/pod1/labconfig.yaml index b0ca944b..89ff1163 100644 --- a/labconfig/orange/pod1/labconfig.yaml +++ b/labconfig/orange/pod1/labconfig.yaml @@ -1,76 +1,123 @@ labconfig: lab_location: orangepod1 - bridges: - - type: admin - bridge: brAdm - cidr: 192.168.1.0/24 - gateway: 192.168.1.1 - - type: data - bridge: brData - cidr: 192.168.11.0/24 - gateway: - - type: storage - bridge: brStorage - cidr: 192.168.21.0/24 - gateway: labsettings: upstream_dns: 192.168.1.1 nodes: - - type: compute + - name: rack-1-m1 architecture: x86_64 - pxe_mac_address: - - "68:b5:99:74:e3:a8" + 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: pod1Admin - - type: compute + pass: pod2Admin + - name: rack-1-m2 architecture: x86_64 - pxe_mac_address: - - "68:b5:99:75:05:5e" + 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: pod1Admin - - type: control + pass: pod2Admin: + - name: rack-1-m3 architecture: x86_64 - pxe_mac_address: - - "94:57:a5:52:53:7c" + 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: pod1Admin - - type: control + pass: pod2Admin + - name: rack-1-m4 architecture: x86_64 - pxe_mac_address: - - "94:57:a5:52:c1:54" + 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: pod1Admin - - type: control + pass: pod2Admin + - name: rack-1-m5 architecture: x86_64 - pxe_mac_address: - - "94:57:a5:52:c1:d8" + 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: pod1Admin + pass: pod2Admin opnfv: release: c distro: trusty type: nonha openstack: liberty sdncontroller: - - type: nosdn + - type: nosdn storage: - - type: ceph - disk: /srv/osd + - type: ceph + disk: /dev/sdb /dev/sdc floating-ip-range: feature: odl_l2 - ext-port: eth5 + 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: diff --git a/labconfig/orange/pod2/labconfig.yaml b/labconfig/orange/pod2/labconfig.yaml index 29d84d14..3193b8bc 100644 --- a/labconfig/orange/pod2/labconfig.yaml +++ b/labconfig/orange/pod2/labconfig.yaml @@ -1,95 +1,159 @@ labconfig: - lab_location: orangepod1 - bridges: - - type: admin - bridge: brAdm - cidr: 192.168.2.0/24 - gateway: 192.168.2.1 - - type: data - bridge: brData - cidr: 192.168.12.0/24 - gateway: - - type: storage - bridge: brStorage - cidr: 192.168.22.0/24 - gateway: + lab_location: orangepod2 labsettings: upstream_dns: 192.168.2.1 nodes: - - type: compute + - name: rack-2-m1 architecture: x86_64 - pxe_mac_address: - - "38:63:bb:3f:bc:c8" + 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 - - type: compute + - name: rack-2-m2 architecture: x86_64 - pxe_mac_address: - - "38:63:bb:44:34:84" + 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: po2Admin - - type: compute + pass: pod2Admin + - name: rack-2-m3 architecture: x86_64 - pxe_mac_address: - - "38:63:bb:3f:1d:8c" + 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 - - type: compute + - name: rack-2-m4 architecture: x86_64 - pxe_mac_address: - - "38:63:bb:3f:2d:a8" + 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 - - type: control + - name: rack-2-m5 architecture: x86_64 - pxe_mac_address: - - "94:57:a5:52:c9:48" + 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 - - type: control + - name: rack-2-m6 architecture: x86_64 - pxe_mac_address: - - "94:57:a5:52:63:b0" + 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 - - type: control + - name: rack-2-m7 architecture: x86_64 - pxe_mac_address: - - "94:57:a5:52:f1:80" + 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 - opnfv: release: c distro: trusty type: nonha openstack: liberty sdncontroller: - - type: nosdn + - type: nosdn storage: - - type: ceph - disk: /srv/osd + - type: ceph + disk: /dev/sdb /dev/sdc floating-ip-range: feature: odl_l2 - ext-port: eth5 + ext-port: eth1 + spaces: + - type: admin + bridge: brAdm + cidr: 192.168.2.0/24 + gateway: 192.168.2.1 + vlan: + - type: data + bridge: brData + cidr: 192.168.12.0/24 + gateway: + vlan: + - type: storage + bridge: brStorage + cidr: 192.168.22.0/24 + gateway: |