diff --git a/ansible/group_vars/all/controllers b/ansible/group_vars/all/controllers index f09d5dcdb..4cb87c28b 100644 --- a/ansible/group_vars/all/controllers +++ b/ansible/group_vars/all/controllers @@ -12,6 +12,7 @@ controller_bootstrap_user: "{{ lookup('env', 'USER') }}" # List of default networks to which controller nodes are attached. controller_default_network_interfaces: > {{ [provision_oc_net_name, + oob_wl_net_name, provision_wl_net_name, internal_net_name, external_net_name, diff --git a/ansible/group_vars/all/network b/ansible/group_vars/all/network index f3beea4dd..f3a3198cb 100644 --- a/ansible/group_vars/all/network +++ b/ansible/group_vars/all/network @@ -2,10 +2,18 @@ ############################################################################### # Network role to network name mappings. +# Name of the network used by the overcloud hosts to manage the bare metal +# compute hosts via their out-of-band management controllers. +oob_oc_net_name: 'oob_oc_net' + # Name of the network used by the seed to provision the bare metal overcloud # hosts. provision_oc_net_name: 'provision_oc_net' +# Name of the network used by the overcloud hosts to provision the bare metal +# workload hosts. +oob_wl_net_name: 'oob_wl_net' + # Name of the network used by the overcloud hosts to provision the bare metal # workload hosts. provision_wl_net_name: 'provision_wl_net' diff --git a/ansible/group_vars/all/seed b/ansible/group_vars/all/seed index 3d17faebf..13d600d37 100644 --- a/ansible/group_vars/all/seed +++ b/ansible/group_vars/all/seed @@ -6,6 +6,17 @@ # setup the Kayobe user account. seed_bootstrap_user: "{{ lookup('env', 'USER') }}" +############################################################################### +# Seed network interface configuration. + +# List of default networks to which seed nodes are attached. +seed_default_network_interfaces: > + {{ [oob_oc_net_name, + provision_oc_net_name] | unique | list }} + +# List of extra networks to which seed nodes are attached. +seed_extra_network_interfaces: [] + ############################################################################### # Seed node LVM configuration. diff --git a/ansible/group_vars/seed/network b/ansible/group_vars/seed/network index 379999115..2576eb1ed 100644 --- a/ansible/group_vars/seed/network +++ b/ansible/group_vars/seed/network @@ -7,13 +7,6 @@ network_interfaces: > {{ (seed_default_network_interfaces + seed_extra_network_interfaces) | unique | list }} -# List of default networks to which seed nodes are attached. -seed_default_network_interfaces: > - {{ [provision_oc_net_name] | unique | list }} - -# List of extra networks to which seed nodes are attached. -seed_extra_network_interfaces: [] - ############################################################################### # Network interface definitions. diff --git a/doc/source/architecture.rst b/doc/source/architecture.rst index bc0d1cf33..3f33b430a 100644 --- a/doc/source/architecture.rst +++ b/doc/source/architecture.rst @@ -35,9 +35,15 @@ Kayobe's network configuration is very flexible but does define a few default classes of networks. These are logical networks and may map to one or more physical networks in the system. +Overcloud out-of-band network + Name of the network used by the seed to access the out-of-band management + controllers of the bare metal overcloud hosts. Overcloud provisioning network The overcloud provisioning network is used by the seed host to provision the cloud hosts. +Workload out-of-band network + Name of the network used by the overcloud hosts to access the out-of-band + management controllers of the bare metal workload hosts. Workload provisioning network The workload provisioning network is used by the cloud hosts to provision the bare metal compute hosts. diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 4a5bfbb51..a4c511e43 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -170,9 +170,15 @@ In order to provide flexibility in the system's network topology, Kayobe maps the named networks to logical network roles. A single named network may perform multiple roles, or even none at all. The available roles are: +``oob_oc_net_name`` + Name of the network used by the seed to access the out-of-band management + controllers of the bare metal overcloud hosts. ``provision_oc_net_name`` Name of the network used by the seed to provision the bare metal overcloud hosts. +``oob_wl_net_name`` + Name of the network used by the overcloud hosts to access the out-of-band + management controllers of the bare metal workload hosts. ``provision_wl_net_name`` Name of the network used by the overcloud hosts to provision the bare metal workload hosts. diff --git a/etc/kayobe/networks.yml b/etc/kayobe/networks.yml index 62e0eb2ad..62279b7cf 100644 --- a/etc/kayobe/networks.yml +++ b/etc/kayobe/networks.yml @@ -4,13 +4,21 @@ ############################################################################### # Network role to network mappings. +# Name of the network used by the seed to manage the bare metal overcloud +# hosts via their out-of-band management controllers. +#oob_oc_net_name: + # Name of the network used by the seed to provision the bare metal overcloud # hosts. #provision_oc_net_name: # Name of the network used by the overcloud hosts to provision the bare metal # workload hosts. -#provision_wl_net_name: +#oob_wl_net_name: + +# Name of the network used by the overcloud hosts to manage the bare metal +# compute hosts via their out-of-band management controllers. +#provision_oob_net_name: # Name of the network used to expose the internal OpenStack API endpoints. #internal_net_name: @@ -32,6 +40,17 @@ ############################################################################### # Network definitions. +# Overcloud out-of-band management network IP information. +# oob_oc_net_cidr: +# oob_oc_net_allocation_pool_start: +# oob_oc_net_allocation_pool_end: +# oob_oc_net_inspection_allocation_pool_start: +# oob_oc_net_inspection_allocation_pool_end: +# oob_oc_net_gateway: +# oob_oc_net_vlan: +# oob_oc_net_mtu: +# oob_oc_net_routes: + # Overcloud provisioning network IP information. # provision_oc_net_cidr: # provision_oc_net_allocation_pool_start: @@ -43,6 +62,19 @@ # provision_oc_net_mtu: # provision_oc_net_routes: +# Workload out-of-band management network IP information. +# oob_wl_net_cidr: +# oob_wl_net_allocation_pool_start: +# oob_wl_net_allocation_pool_end: +# oob_wl_net_inspection_allocation_pool_start: +# oob_wl_net_inspection_allocation_pool_end: +# oob_wl_net_neutron_allocation_pool_start: +# oob_wl_net_neutron_allocation_pool_end: +# oob_wl_net_gateway: +# oob_wl_net_vlan: +# oob_wl_net_mtu: +# oob_wl_net_routes: + # Workload provisioning network IP information. # provision_wl_net_cidr: # provision_wl_net_allocation_pool_start: