openstack
/
tripleo-quickstart
Code Issues Proposed changes

Baremetal deploy network ports support 

Add networks section to node topologies.
Uses the default TripleO network-isolation
networks.

Partial-Implements: blueprint network-data-v2-ports
Change-Id: Iaa0e25d2af4e638b9e05d8454ada326b00a0429f
This commit is contained in:
Harald Jensås 2020-12-15 02:53:00 +01:00
parent f1bc42d3fa
commit 5b0232d7c5
18 changed files with 444 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config/nodes/1ctlr.yml
View File

@ -14,3 +14,16 @@ deployed_server_overcloud_roles:
topology_map:
Compute:
scale: 0
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet

44
config/nodes/1ctlr_1cellctrl_1comp.yml
View File

@ -24,11 +24,55 @@ node_count: 3
topology_map:
Compute:
scale: 0
networks:
- network: ctlplane
vif: true
- network: internal_api
subnet: internal_api_subnet
- network: tenant
subnet: tenant_subnet
- network: storage
subnet: storage_subnet
CellController:
scale: 0
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet
cell_topology_map:
CellController:
scale: 1
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet
Compute:
scale: 1
networks:
- network: ctlplane
vif: true
- network: internal_api
subnet: internal_api_subnet
- network: tenant
subnet: tenant_subnet
- network: storage
subnet: storage_subnet

22
config/nodes/1ctlr_1comp.yml
View File

@ -18,5 +18,27 @@ node_count: 2
topology_map:
Controller:
scale: 1
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet
Compute:
scale: 1
networks:
- network: ctlplane
vif: true
- network: internal_api
subnet: internal_api_subnet
- network: tenant
subnet: tenant_subnet
- network: storage
subnet: storage_subnet

33
config/nodes/1ctlr_1comp_1ceph.yml
View File

@ -18,8 +18,41 @@ node_count: 3
# Tell tripleo which nodes to deploy.
topology_map:
Controller:
scale: 1
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet
Compute:
scale: 1
networks:
- network: ctlplane
vif: true
- network: internal_api
subnet: internal_api_subnet
- network: tenant
subnet: tenant_subnet
- network: storage
subnet: storage_subnet
CephStorage:
scale: 1
networks:
- network: ctlplane
vif: true
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
network_isolation: true
network_isolation_type: 'single-nic-vlans'

29
config/nodes/1ctlr_1comp_1supp.yml
View File

@ -11,6 +11,35 @@ overcloud_nodes:
flavor: compute
virtualbmc_port: 6233
# Tell tripleo which nodes to deploy.
topology_map:
Controller:
scale: 1
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet
Compute:
scale: 1
networks:
- network: ctlplane
vif: true
- network: internal_api
subnet: internal_api_subnet
- network: tenant
subnet: tenant_subnet
- network: storage
subnet: storage_subnet
# Define the supplmental node to be used for the FreeIPA server.
supplemental_node:
name: ipa

29
config/nodes/1ctlr_1comp_64gb.yml
View File

@ -21,4 +21,33 @@ overcloud_nodes:
flavor: compute
virtualbmc_port: 6231
# Tell tripleo which nodes to deploy.
topology_map:
Controller:
scale: 1
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet
Compute:
scale: 1
networks:
- network: ctlplane
vif: true
- network: internal_api
subnet: internal_api_subnet
- network: tenant
subnet: tenant_subnet
- network: storage
subnet: storage_subnet
node_count: 2

22
config/nodes/1ctlr_2comp.yml
View File

@ -23,5 +23,27 @@ node_count: 3
topology_map:
Controller:
scale: 1
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet
Compute:
scale: 2
networks:
- network: ctlplane
vif: true
- network: internal_api
subnet: internal_api_subnet
- network: tenant
subnet: tenant_subnet
- network: storage
subnet: storage_subnet

24
config/nodes/1ctlr_2comp_1supp.yml
View File

@ -24,5 +24,29 @@ supplemental_node:
flavor: undercloud
topology_map:
Controller:
scale: 1
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet
Compute:
scale: 2
networks:
- network: ctlplane
vif: true
- network: internal_api
subnet: internal_api_subnet
- network: tenant
subnet: tenant_subnet
- network: storage
subnet: storage_subnet

15
config/nodes/2ctlr.yml
View File

@ -15,5 +15,20 @@ deployed_server_overcloud_roles:
hosts: "$(sed -n 1,1p /etc/nodepool/sub_nodes_private)"
topology_map:
Controller:
scale: 2
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet
Compute:
scale: 0

23
config/nodes/3ctlr_1comp.yml
View File

@ -40,5 +40,28 @@ overcloud_nodes:
topology_map:
Controller:
scale: 3
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet
Compute:
scale: 1
networks:
- network: ctlplane
vif: true
- network: internal_api
subnet: internal_api_subnet
- network: tenant
subnet: tenant_subnet
- network: storage
subnet: storage_subnet

22
config/nodes/3ctlr_1comp_192gb.yml
View File

@ -40,5 +40,27 @@ overcloud_nodes:
topology_map:
Controller:
scale: 3
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet
Compute:
scale: 1
networks:
- network: ctlplane
vif: true
- network: internal_api
subnet: internal_api_subnet
- network: tenant
subnet: tenant_subnet
- network: storage
subnet: storage_subnet

22
config/nodes/3ctlr_1comp_1supp.yml
View File

@ -29,5 +29,27 @@ supplemental_node:
topology_map:
Controller:
scale: 3
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet
Compute:
scale: 1
networks:
- network: ctlplane
vif: true
- network: internal_api
subnet: internal_api_subnet
- network: tenant
subnet: tenant_subnet
- network: storage
subnet: storage_subnet

22
config/nodes/3ctlr_1comp_64gb.yml
View File

@ -41,5 +41,27 @@ overcloud_nodes:
topology_map:
Controller:
scale: 3
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet
Compute:
scale: 1
networks:
- network: ctlplane
vif: true
- network: internal_api
subnet: internal_api_subnet
- network: tenant
subnet: tenant_subnet
- network: storage
subnet: storage_subnet

29
config/nodes/3ctlr_2comp_3ceph.yml
View File

@ -57,7 +57,36 @@ node_count: 8
topology_map:
Controller:
scale: 3
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet
Compute:
scale: 2
networks:
- network: ctlplane
vif: true
- network: internal_api
subnet: internal_api_subnet
- network: tenant
subnet: tenant_subnet
- network: storage
subnet: storage_subnet
CephStorage:
scale: 3
networks:
- network: ctlplane
vif: true
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet

22
config/nodes/3ctlr_3comp.yml
View File

@ -50,5 +50,27 @@ network_isolation_type: 'single-nic-vlans'
topology_map:
Controller:
scale: 3
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet
Compute:
scale: 3
networks:
- network: ctlplane
vif: true
- network: internal_api
subnet: internal_api_subnet
- network: tenant
subnet: tenant_subnet
- network: storage
subnet: storage_subnet

29
config/nodes/baremetal_1ctlr_1comp.yml
View File

@ -1,2 +1,31 @@
# Overcloud nodes are defined in hardware-specific files.
overcloud_nodes:
# Tell tripleo which nodes to deploy.
topology_map:
Controller:
scale: 1
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet
Compute:
scale: 1
networks:
- network: ctlplane
vif: true
- network: internal_api
subnet: internal_api_subnet
- network: tenant
subnet: tenant_subnet
- network: storage
subnet: storage_subnet

22
config/nodes/baremetal_3ctlr_1comp.yml
View File

@ -8,5 +8,27 @@ overcloud_nodes:
topology_map:
Controller:
scale: 3
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet
Compute:
scale: 1
networks:
- network: ctlplane
vif: true
- network: internal_api
subnet: internal_api_subnet
- network: tenant
subnet: tenant_subnet
- network: storage
subnet: storage_subnet

22
config/nodes/baremetal_3ctlr_2comp.yml
View File

@ -10,5 +10,27 @@ node_count: 5
topology_map:
Controller:
scale: 3
networks:
- network: ctlplane
vif: true
- network: external
subnet: external_subnet
- network: internal_api
subnet: internal_api_subnet
- network: storage
subnet: storage_subnet
- network: storage_mgmt
subnet: storage_mgmt_subnet
- network: tenant
subnet: tenant_subnet
Compute:
scale: 2
networks:
- network: ctlplane
vif: true
- network: internal_api
subnet: internal_api_subnet
- network: tenant
subnet: tenant_subnet
- network: storage
subnet: storage_subnet