diff options
author | 2020-05-04 13:57:29 -0700 | |
---|---|---|
committer | 2020-10-05 21:25:18 +0000 | |
commit | da4f1540dec64779c01f7d0258b1a748ace9b131 (patch) | |
tree | 47856f75607849dc848dadcbcb1a7d048f91f7f7 /site/intel-pod17/networks/physical/networks.yaml | |
parent | 05686a28172cd3e79c71987cf495e0e67e064eb1 (diff) |
Treasuremap 1.8 integration
Upgrade pod 17 to Treasuremap 1.8 prime for CNTT RI-1.
Added deploy script enhancement to include pregenesis, certs, and wrapper
for shipyard cli command.
Added clean-genesis script to properly clean genesis node for redeployment.
Signed-off-by: James Gu <james.gu@att.com>
Change-Id: I4c150ef216d5eb631a0980c72b3c6c80a55788d0
Signed-off-by: James Gu <james.gu@att.com>
Diffstat (limited to 'site/intel-pod17/networks/physical/networks.yaml')
-rw-r--r-- | site/intel-pod17/networks/physical/networks.yaml | 285 |
1 files changed, 106 insertions, 179 deletions
diff --git a/site/intel-pod17/networks/physical/networks.yaml b/site/intel-pod17/networks/physical/networks.yaml index b8e1ea8..5c438f5 100644 --- a/site/intel-pod17/networks/physical/networks.yaml +++ b/site/intel-pod17/networks/physical/networks.yaml @@ -7,12 +7,12 @@ # +--------+------------+-----------------------------------+-----------+----------+----------------+ # | | | | | | | # +--------+------------+-----------------------------------+-----------+----------+----------------+ -# |IF0 1G | dmz | OoB & OAM (default route) | VLAN 170 | untagged | 10.10.170.0/24 | -# |IF1 1G | admin | PXE boot network | VLAN 171 | untagged | 10.10.171.0/24 | -# |IF2 10G | private | Underlay Calico and OVS overlay | VLAN 172 | untagged | 10.10.172.0/24 | -# | | management | Management (unused for now) | VLAN 174 | tagged | 10.10.174.0/24 | +# |IF0 1G | dmz | OOB and OAM (default route) | VLAN 170 | untagged | 10.10.170.0/25 | +# |IF1 1G | pxe | PXE boot network | VLAN 171 | untagged | 10.10.171.0/24 | +# |IF2 10G | calico | Underlay Calico | VLAN 172 | untagged | 10.10.172.0/24 | +# | | overlay | overlay network for openstack SDN | VLAN 174 | tagged | 10.10.174.0/24 | # |IF3 10G | storage | Storage network | VLAN 173 | untagged | 10.10.173.0/24 | -# | | public | Public network for VMs | VLAN 1173 | tagged | 10.10.175.0/24 | +# | | routable | OVS-F (OVS Floating IP – Public) | VLAN 1173 | tagged | 10.10.175.0/24 | # +--------+------------+-----------------------------------+-----------+----------+----------------+ # # For standard Airship/OPNFV deployments, you should not need to modify the @@ -23,31 +23,6 @@ # and how-tos on working with Drydock/YAMLs in more generic way and enabling # custom/additional features not represented here (such as bonded networks). # See https://airship-drydock.readthedocs.io/en/latest/topology.html#defining-networking - -schema: 'drydock/NetworkLink/v1' -metadata: - schema: 'metadata/Document/v1' - name: oob - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - # MaaS doesn't own this network like it does the others, - # so the noconfig label is specified. - labels: - noconfig: enabled - bonding: - mode: disabled - mtu: 1500 - linkspeed: auto - trunking: - mode: disabled - default_network: oob - allowed_networks: - - oob -... ---- schema: 'drydock/Network/v1' metadata: schema: 'metadata/Document/v1' @@ -55,6 +30,12 @@ metadata: layeringDefinition: abstract: false layer: site + parentSelector: + network_role: oob + topology: cruiserlite + actions: + - method: merge + path: . storagePolicy: cleartext data: # NEWSITE-CHANGEME: Update with the site's out-of-band CIDR @@ -66,101 +47,24 @@ data: metric: 100 ... --- -schema: 'drydock/NetworkLink/v1' -metadata: - schema: 'metadata/Document/v1' - name: dmz - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - bonding: - mode: disabled - mtu: 1500 - linkspeed: auto - trunking: - mode: disabled - default_network: dmz - allowed_networks: - - dmz -... ---- schema: 'drydock/Network/v1' metadata: schema: 'metadata/Document/v1' - name: dmz - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - # NEWSITE-CHANGEME: Update with the site's DMZ network CIDR - cidr: 10.10.170.0/24 - routes: - - subnet: 0.0.0.0/0 - # NEWSITE-CHANGEME: Set the DMZ network gateway IP address - # NOTE: This serves as the site's default route. - gateway: 10.10.170.1 - metric: 100 - ranges: - # NEWSITE-CHANGEME: Exclude any reserved IPs for the lab. - - type: reserved - start: 10.10.171.1 - end: 10.10.171.19 - # NEWSITE-CHANGEME: Update static range that will be used for the nodes. - # See minimum range required for the nodes in baremetal/nodes.yaml. - - type: static - start: 10.10.170.20 - end: 10.10.170.39 - dns: - # NEWSITE-CHANGEME: FQDN for bare metal nodes. - # Choose FQDN according to the node FQDN naming conventions at the top of - # this document. - domain: intel-pod17.opnfv.org - # List of upstream DNS forwards. Verify you can reach them from your - # environment. If so, you should not need to change them. - # TODO: This should be populated via substitution from common-addresses - servers: '8.8.8.8,8.8.4.4' -... ---- -schema: 'drydock/NetworkLink/v1' -metadata: - schema: 'metadata/Document/v1' - name: admin - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - bonding: - mode: disabled - mtu: 1500 - linkspeed: auto - trunking: - mode: disabled - default_network: admin - allowed_networks: - - admin -... ---- -schema: 'drydock/Network/v1' -metadata: - schema: 'metadata/Document/v1' - name: admin + name: pxe layeringDefinition: abstract: false layer: site + parentSelector: + network_role: pxe + topology: cruiserlite + actions: + - method: merge + path: . storagePolicy: cleartext data: # NEWSITE-CHANGEME: Update with the site's PXE network CIDR # NOTE: The CIDR minimum size = (number of nodes * 2) + 10 cidr: 10.10.171.0/24 - routes: - - subnet: 0.0.0.0/0 - # NEWSITE-CHANGEME: Set the Admin network gateway IP address - gateway: 10.10.171.1 - metric: 100 # NOTE: The DHCP addresses are used when nodes perform a PXE boot # (DHCP address gets assigned), and when a node is commissioning in MaaS # (also uses DHCP to get its IP address). However, when MaaS installs the @@ -181,55 +85,66 @@ data: # excluding the reserved IPs. - type: dhcp start: 10.10.171.40 - end: 10.10.171.79 - dns: - # NEWSITE-CHANGEME: FQDN for bare metal nodes. - # Choose FQDN according to the node FQDN naming conventions at the top of - # this document. - domain: intel-pod17.opnfv.org + end: 10.10.171.128 +# dns: # NEWSITE-CHANGEME: Use MAAS VIP as the DNS server. # MAAS has inbuilt DNS server and Debian mirror that allows nodes to be # deployed without requiring routed/internet access for the Admin/PXE interface. # See data.vip.maas_vip in networks/common-addresses.yaml. # TODO: This should be populated via substitution from common-addresses - servers: '10.10.171.100' +# servers: '10.10.171.20' ... --- -schema: 'drydock/NetworkLink/v1' +schema: 'drydock/Network/v1' metadata: schema: 'metadata/Document/v1' - name: data1 + name: oam layeringDefinition: abstract: false layer: site + parentSelector: + network_role: oam + topology: cruiserlite + actions: + - method: merge + path: . storagePolicy: cleartext data: - bonding: - mode: disabled - # NEWSITE-CHANGEME: Ensure the network switches in the environment are - # configured for this MTU or greater. - mtu: 1500 - linkspeed: auto - trunking: - mode: 802.1q - allowed_networks: - - private - - management + # NEWSITE-CHANGEME: Update with the site's DMZ network CIDR + cidr: 10.10.170.0/24 + routes: + - subnet: 0.0.0.0/0 + # NEWSITE-CHANGEME: Set the DMZ network gateway IP address + # NOTE: This serves as the site's default route. + gateway: 10.10.170.1 + metric: 100 + ranges: + # NEWSITE-CHANGEME: Exclude any reserved IPs for the lab. + - type: reserved + start: 10.10.170.1 + end: 10.10.170.19 + # NEWSITE-CHANGEME: Update static range that will be used for the nodes. + # See minimum range required for the nodes in baremetal/nodes.yaml. + - type: static + start: 10.10.170.20 + end: 10.10.170.39 ... --- schema: 'drydock/Network/v1' metadata: schema: 'metadata/Document/v1' - name: private + name: calico layeringDefinition: abstract: false layer: site + parentSelector: + network_role: calico + topology: cruiserlite + actions: + - method: merge + path: . storagePolicy: cleartext data: - # NEWSITE-CHANGEME: Set the VLAN ID which the Private network is on - # use '0' if the vlan is untagged - vlan: '0' - mtu: 1500 # NEWSITE-CHANGEME: Set the CIDR for the Private network # NOTE: The CIDR minimum size = number of nodes + 10 cidr: 10.10.172.0/24 @@ -244,47 +159,42 @@ data: schema: 'drydock/Network/v1' metadata: schema: 'metadata/Document/v1' - name: management + name: overlay layeringDefinition: abstract: false layer: site + parentSelector: + network_role: os-overlay + topology: cruiserlite + actions: + - method: merge + path: . storagePolicy: cleartext data: # NEWSITE-CHANGEME: Set the VLAN ID which the Management network is on vlan: '174' - mtu: 1500 # NEWSITE-CHANGEME: Set the CIDR for the Management network # NOTE: The CIDR minimum size = number of nodes + 10 cidr: 10.10.174.0/24 ranges: + # NEWSITE-CHANGEME: Update to the first 10 IPs in the CIDR + - type: reserved + start: 10.10.174.1 + end: 10.10.174.10 # NEWSITE-CHANGEME: Update to the remaining range excluding (if any) # reserved IPs. - type: static - start: 10.10.174.1 - end: 10.23.21.19 -... ---- -schema: 'drydock/NetworkLink/v1' -metadata: - schema: 'metadata/Document/v1' - name: data2 - layeringDefinition: - abstract: false - layer: site - storagePolicy: cleartext -data: - bonding: - mode: disabled - # NEWSITE-CHANGEME: Ensure the network switches in the environment are - # configured for this MTU or greater. - mtu: 1500 - linkspeed: auto - trunking: - mode: 802.1q - default_network: storage - allowed_networks: - - storage - - public + start: 10.10.174.11 + end: 10.10.174.100 + routes: + - subnet: 0.0.0.0/0 + # NEWSITE-CHANGEME: Update to the gateway address for this network + gateway: 10.10.174.1 + labels: + # NEWSITE-CHANGEME: All cruisers should have this enabled, set to false if this + # is a special case. If set to false, IP Addresses and CIDR will still need + # to be specified above to satisfy the schema and substitution used by other documents. + enabled: true ... --- schema: 'drydock/Network/v1' @@ -294,14 +204,14 @@ metadata: layeringDefinition: abstract: false layer: site + parentSelector: + network_role: storage + topology: cruiserlite + actions: + - method: merge + path: . storagePolicy: cleartext data: - # NEWSITE-CHANGEME: Set the VLAN ID which the Storage network is on - # use '0' if the vlan is untagged - vlan: '0' - # NEWSITE-CHANGEME: Ensure the network switches in the environment are - # configured for this MTU or greater. - mtu: 1500 # NEWSITE-CHANGEME: Set the CIDR for the Storage network # NOTE: The CIDR minimum size = number of nodes + 10 cidr: 10.10.173.0/24 @@ -313,22 +223,39 @@ data: end: 10.10.173.19 ... --- -# The public network for OpenStack VMs. -# NOTE: Only interface 'ens785f1.1173' will be setup, no IPs assigned to hosts schema: 'drydock/Network/v1' metadata: schema: 'metadata/Document/v1' - name: public + name: routable layeringDefinition: abstract: false layer: site + parentSelector: + network_role: os-routable + topology: cruiserlite + actions: + - method: merge + path: . storagePolicy: cleartext data: # NEWSITE-CHANGEME: Set the VLAN ID which the Public network is on vlan: '1173' - # NEWSITE-CHANGEME: Ensure the network switches in the environment are - # configured for this MTU or greater. - mtu: 1500 - # NEWSITE-CHANGEME: Set the CIDR for the Public network + # NEWSITE-CHANGEME: Set the CIDR for the OVS-F (OVS Floating IP – Public) network cidr: 10.10.175.0/24 + ranges: + - type: reserved + # NEWSITE-CHANGEME: Update to the start and end addresses to be used for the Floating IP pool + start: 10.10.175.31 + end: 10.10.175.128 + routes: + - subnet: 0.0.0.0/0 + # NEWSITE-CHANGEME: Update to the gateway address for this network + gateway: 10.10.175.1 + metric: 100 + labels: + # NEWSITE-CHANGEME: All cruisers should have this enabled, set to false if this + # is a special case in corridor 1 that doesn't support a floating IP pool. + # If set to false, IP Addresses and CIDR will still need to be specified + # above to satisfy the schema and substitution used by other documents. + enabled: true ... |