diff options
Diffstat (limited to 'config')
35 files changed, 707 insertions, 50 deletions
diff --git a/config/deploy/common-patches.yaml b/config/deploy/common-patches.yaml new file mode 100644 index 00000000..bac6812c --- /dev/null +++ b/config/deploy/common-patches.yaml @@ -0,0 +1,45 @@ +--- +patches: + master: + undercloud: + - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36 + project: openstack/tripleo-common + - change-id: Iaa2276aadae351fbc138de258c51d786f69e4395 + project: openstack/tripleo-common + - change-id: I8d1db69d520da069099f919f286e6a553dd645a5 + project: openstack/tripleo-heat-templates + - change-id: Ia51a825d11bd9b94d0110f13cdf2a6bbcedf6194 + project: openstack/tripleo-common + overcloud: + - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310 + project: openstack/puppet-tripleo + - change-id: I93e3d355625508fdc42f44bdd358f3ba86fbd8d7 + project: openstack/puppet-tripleo + rocky: + undercloud: + - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36 + project: openstack/tripleo-common + branch: master + - change-id: Iaa2276aadae351fbc138de258c51d786f69e4395 + project: openstack/tripleo-common + branch: master + - change-id: I8d1db69d520da069099f919f286e6a553dd645a5 + project: openstack/tripleo-heat-templates + - change-id: Ia51a825d11bd9b94d0110f13cdf2a6bbcedf6194 + project: openstack/tripleo-common + overcloud: + - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310 + project: openstack/puppet-tripleo + branch: master + - change-id: I93e3d355625508fdc42f44bdd358f3ba86fbd8d7 + project: openstack/puppet-tripleo + branch: master + queens: + undercloud: + - change-id: I966bf7f6f8d1cbc656abfad59e8bb927e1aa53c2 + project: openstack/tripleo-common + overcloud: + - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310 + project: openstack/puppet-tripleo + - change-id: I93e3d355625508fdc42f44bdd358f3ba86fbd8d7 + project: openstack/puppet-tripleo diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml index 47bf0834..caef2628 100644 --- a/config/deploy/deploy_settings.yaml +++ b/config/deploy/deploy_settings.yaml @@ -7,8 +7,17 @@ # If ha_enabled is false, there will only be one controller. global_params: ha_enabled: true + # introspect defaults to True, + # Enables/disables the introspection process at deploy time. + introspect: true + # ipxe defaults to True + # Enables/disables the use of ipxe for provisioning + ipxe: true deploy_options: + # Whether or not to use containers for the overcloud services + containers: true + # Which SDN controller to use. Valid options are 'opendaylight', 'onos', # 'opendaylight-external', 'opencontrail' or false. A value of false will # use Neutron's OVS ML2 controller. @@ -46,6 +55,11 @@ deploy_options: # The dataplane should be specified as fdio if this is set to true vpp: false + # Whether to install and configure SRIOV service in the compute node(s) to + # allow VMs to use VFs/PFs. The user must know in advance the name of the + # SRIOV capable NIC that will be configured. + sriov: em2 + # Whether to run vsperf after the install has completed # vsperf: false @@ -94,3 +108,8 @@ deploy_options: # Set dovetail option to install dovetail # dovetail: false + + # Whether the nodes are deployed as openstack, kubernetes or openshift nodes + # Defaults to openstack. + # Possible values are openstack, k8s, openshift + vim: 'openstack' diff --git a/config/deploy/os-nosdn-pike-noha.yaml b/config/deploy/k8s-nosdn-nofeature-noha.yaml index 11417840..33a9b41a 100644 --- a/config/deploy/os-nosdn-pike-noha.yaml +++ b/config/deploy/k8s-nosdn-nofeature-noha.yaml @@ -3,12 +3,14 @@ global_params: ha_enabled: false patches: undercloud: - - change-id: I301370fbf47a71291614dd60e4c64adc7b5ebb42 + - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6 project: openstack/tripleo-heat-templates + deploy_options: - os_version: pike sdn_controller: false tacker: false congress: false sfc: false vpn: false + ceph: false + vim: 'k8s' diff --git a/config/deploy/os-nosdn-calipso-noha.yaml b/config/deploy/os-nosdn-calipso-noha.yaml index ce5c8a5e..6502bcb0 100644 --- a/config/deploy/os-nosdn-calipso-noha.yaml +++ b/config/deploy/os-nosdn-calipso-noha.yaml @@ -3,6 +3,7 @@ global_params: ha_enabled: false deploy_options: + containers: true sdn_controller: false sfc: false vpn: false diff --git a/config/deploy/os-nosdn-calipso_rocky-noha.yaml b/config/deploy/os-nosdn-calipso_rocky-noha.yaml new file mode 100644 index 00000000..b14ceed5 --- /dev/null +++ b/config/deploy/os-nosdn-calipso_rocky-noha.yaml @@ -0,0 +1,11 @@ +--- +global_params: + ha_enabled: false + +deploy_options: + containers: true + os_version: rocky + sdn_controller: false + sfc: false + vpn: false + calipso: true diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml index 93a1fb6f..d896a672 100644 --- a/config/deploy/os-nosdn-nofeature-ha.yaml +++ b/config/deploy/os-nosdn-nofeature-ha.yaml @@ -3,8 +3,10 @@ global_params: ha_enabled: true deploy_options: + containers: true + os_version: master sdn_controller: false - tacker: true - congress: true + tacker: false + congress: false sfc: false vpn: false diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml index 77e5d5e2..0725031f 100644 --- a/config/deploy/os-nosdn-nofeature-noha.yaml +++ b/config/deploy/os-nosdn-nofeature-noha.yaml @@ -3,8 +3,10 @@ global_params: ha_enabled: false deploy_options: + containers: true + os_version: master sdn_controller: false - tacker: true - congress: true + tacker: false + congress: false sfc: false vpn: false diff --git a/config/deploy/os-nosdn-rocky-ha.yaml b/config/deploy/os-nosdn-rocky-ha.yaml new file mode 100644 index 00000000..152a8840 --- /dev/null +++ b/config/deploy/os-nosdn-rocky-ha.yaml @@ -0,0 +1,11 @@ +--- +global_params: + ha_enabled: true +deploy_options: + containers: true + os_version: rocky + sdn_controller: false + tacker: false + congress: false + sfc: false + vpn: false diff --git a/config/deploy/os-ovn-nofeature-noha.yaml b/config/deploy/os-nosdn-rocky-noha.yaml index 8c8c5f97..5fecfb6d 100644 --- a/config/deploy/os-ovn-nofeature-noha.yaml +++ b/config/deploy/os-nosdn-rocky-noha.yaml @@ -1,10 +1,11 @@ --- global_params: ha_enabled: false - deploy_options: - sdn_controller: ovn + containers: true + os_version: rocky + sdn_controller: false tacker: false - congress: true + congress: false sfc: false vpn: false diff --git a/config/deploy/os-odl-bgpvpn-ha.yaml b/config/deploy/os-odl-bgpvpn-ha.yaml index 68b62734..f61e1a60 100644 --- a/config/deploy/os-odl-bgpvpn-ha.yaml +++ b/config/deploy/os-odl-bgpvpn-ha.yaml @@ -3,9 +3,11 @@ global_params: ha_enabled: true deploy_options: + containers: true + os_version: master sdn_controller: opendaylight - odl_version: nitrogen + odl_version: master tacker: false - congress: true + congress: false sfc: false vpn: true diff --git a/config/deploy/os-odl-bgpvpn-noha.yaml b/config/deploy/os-odl-bgpvpn-noha.yaml index 0435e6b5..4bf90aa7 100644 --- a/config/deploy/os-odl-bgpvpn-noha.yaml +++ b/config/deploy/os-odl-bgpvpn-noha.yaml @@ -3,9 +3,11 @@ global_params: ha_enabled: false deploy_options: + containers: true + os_version: master sdn_controller: opendaylight - odl_version: nitrogen + odl_version: master tacker: false - congress: true + congress: false sfc: false vpn: true diff --git a/config/deploy/os-odl-bgpvpn_rocky-ha.yaml b/config/deploy/os-odl-bgpvpn_rocky-ha.yaml new file mode 100644 index 00000000..a0833fd4 --- /dev/null +++ b/config/deploy/os-odl-bgpvpn_rocky-ha.yaml @@ -0,0 +1,13 @@ +--- +global_params: + ha_enabled: true + +deploy_options: + containers: true + os_version: rocky + sdn_controller: opendaylight + odl_version: master + tacker: false + congress: false + sfc: false + vpn: true diff --git a/config/deploy/os-odl-bgpvpn_rocky-noha.yaml b/config/deploy/os-odl-bgpvpn_rocky-noha.yaml new file mode 100644 index 00000000..6bc5adf3 --- /dev/null +++ b/config/deploy/os-odl-bgpvpn_rocky-noha.yaml @@ -0,0 +1,13 @@ +--- +global_params: + ha_enabled: false + +deploy_options: + containers: true + os_version: rocky + sdn_controller: opendaylight + odl_version: master + tacker: false + congress: false + sfc: false + vpn: true diff --git a/config/deploy/os-odl-l2gw-ha.yaml b/config/deploy/os-odl-l2gw-ha.yaml new file mode 100644 index 00000000..a22da3bb --- /dev/null +++ b/config/deploy/os-odl-l2gw-ha.yaml @@ -0,0 +1,12 @@ +--- +global_params: + ha_enabled: true + +deploy_options: + sdn_controller: opendaylight + odl_version: nitrogen + tacker: false + congress: true + sfc: false + vpn: false + l2gw: true diff --git a/config/deploy/os-odl-csit-noha.yaml b/config/deploy/os-odl-l2gw-noha.yaml index 634b6cb5..ae5218aa 100644 --- a/config/deploy/os-odl-csit-noha.yaml +++ b/config/deploy/os-odl-l2gw-noha.yaml @@ -6,7 +6,7 @@ deploy_options: sdn_controller: opendaylight odl_version: nitrogen tacker: false - congress: false + congress: true sfc: false vpn: false - ceph: false + l2gw: true diff --git a/config/deploy/os-odl-nofeature-ha.yaml b/config/deploy/os-odl-nofeature-ha.yaml index 4dd31e9e..748da3c7 100644 --- a/config/deploy/os-odl-nofeature-ha.yaml +++ b/config/deploy/os-odl-nofeature-ha.yaml @@ -3,9 +3,11 @@ global_params: ha_enabled: true deploy_options: + containers: true + os_version: master sdn_controller: opendaylight - odl_version: nitrogen - tacker: true - congress: true + odl_version: master + tacker: false + congress: false sfc: false vpn: false diff --git a/config/deploy/os-odl-nofeature-noha.yaml b/config/deploy/os-odl-nofeature-noha.yaml index 271d2717..0767822b 100644 --- a/config/deploy/os-odl-nofeature-noha.yaml +++ b/config/deploy/os-odl-nofeature-noha.yaml @@ -3,9 +3,11 @@ global_params: ha_enabled: false deploy_options: + containers: true + os_version: master sdn_controller: opendaylight - odl_version: nitrogen - tacker: true - congress: true + odl_version: master + tacker: false + congress: false sfc: false vpn: false diff --git a/config/deploy/os-odl-pike-noha.yaml b/config/deploy/os-odl-pike-noha.yaml deleted file mode 100644 index 44eff664..00000000 --- a/config/deploy/os-odl-pike-noha.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -global_params: - ha_enabled: false - patches: - undercloud: - - change-id: I301370fbf47a71291614dd60e4c64adc7b5ebb42 - project: openstack/tripleo-heat-templates -deploy_options: - os_version: pike - sdn_controller: opendaylight - odl_version: carbon - tacker: false - congress: false - sfc: false - vpn: false diff --git a/config/deploy/os-odl-queens-ha.yaml b/config/deploy/os-odl-queens-ha.yaml new file mode 100644 index 00000000..9738be38 --- /dev/null +++ b/config/deploy/os-odl-queens-ha.yaml @@ -0,0 +1,13 @@ +--- +global_params: + ha_enabled: true + +deploy_options: + containers: true + os_version: queens + sdn_controller: opendaylight + odl_version: oxygen + tacker: false + congress: false + sfc: false + vpn: false diff --git a/config/deploy/os-odl-queens-noha.yaml b/config/deploy/os-odl-queens-noha.yaml new file mode 100644 index 00000000..0500eec1 --- /dev/null +++ b/config/deploy/os-odl-queens-noha.yaml @@ -0,0 +1,13 @@ +--- +global_params: + ha_enabled: false + +deploy_options: + containers: true + os_version: queens + sdn_controller: opendaylight + odl_version: oxygen + tacker: false + congress: false + sfc: false + vpn: false diff --git a/config/deploy/os-odl-rocky-ha.yaml b/config/deploy/os-odl-rocky-ha.yaml new file mode 100644 index 00000000..8728bd8d --- /dev/null +++ b/config/deploy/os-odl-rocky-ha.yaml @@ -0,0 +1,13 @@ +--- +global_params: + ha_enabled: true + +deploy_options: + containers: true + os_version: rocky + sdn_controller: opendaylight + odl_version: oxygen + tacker: false + congress: false + sfc: false + vpn: false diff --git a/config/deploy/os-odl-rocky-noha.yaml b/config/deploy/os-odl-rocky-noha.yaml new file mode 100644 index 00000000..f6ceb81b --- /dev/null +++ b/config/deploy/os-odl-rocky-noha.yaml @@ -0,0 +1,13 @@ +--- +global_params: + ha_enabled: false + +deploy_options: + containers: true + os_version: rocky + sdn_controller: opendaylight + odl_version: oxygen + tacker: false + congress: false + sfc: false + vpn: false diff --git a/config/deploy/os-odl-sfc-ha.yaml b/config/deploy/os-odl-sfc-ha.yaml index 3a87bfe3..e8df1170 100644 --- a/config/deploy/os-odl-sfc-ha.yaml +++ b/config/deploy/os-odl-sfc-ha.yaml @@ -3,9 +3,11 @@ global_params: ha_enabled: true deploy_options: + containers: true + os_version: master sdn_controller: opendaylight - odl_version: nitrogen - tacker: true - congress: true + odl_version: master + tacker: false + congress: false sfc: true vpn: false diff --git a/config/deploy/os-odl-sfc-noha.yaml b/config/deploy/os-odl-sfc-noha.yaml index 2b08af6c..3dac36fa 100644 --- a/config/deploy/os-odl-sfc-noha.yaml +++ b/config/deploy/os-odl-sfc-noha.yaml @@ -3,9 +3,11 @@ global_params: ha_enabled: false deploy_options: + containers: true + os_version: master sdn_controller: opendaylight - odl_version: nitrogen - tacker: true - congress: true + odl_version: master + tacker: false + congress: false sfc: true vpn: false diff --git a/config/deploy/os-odl-sfc_rocky-ha.yaml b/config/deploy/os-odl-sfc_rocky-ha.yaml new file mode 100644 index 00000000..3a1b6c93 --- /dev/null +++ b/config/deploy/os-odl-sfc_rocky-ha.yaml @@ -0,0 +1,13 @@ +--- +global_params: + ha_enabled: true + +deploy_options: + containers: true + os_version: rocky + sdn_controller: opendaylight + odl_version: master + tacker: false + congress: false + sfc: true + vpn: false diff --git a/config/deploy/os-odl-sfc_rocky-noha.yaml b/config/deploy/os-odl-sfc_rocky-noha.yaml new file mode 100644 index 00000000..8af873a5 --- /dev/null +++ b/config/deploy/os-odl-sfc_rocky-noha.yaml @@ -0,0 +1,13 @@ +--- +global_params: + ha_enabled: false + +deploy_options: + containers: true + os_version: rocky + sdn_controller: opendaylight + odl_version: master + tacker: false + congress: false + sfc: true + vpn: false diff --git a/config/deploy/os-odl-sriov-ha.yaml b/config/deploy/os-odl-sriov-ha.yaml new file mode 100644 index 00000000..03e34a23 --- /dev/null +++ b/config/deploy/os-odl-sriov-ha.yaml @@ -0,0 +1,21 @@ +--- +global_params: + ha_enabled: true + +deploy_options: + sdn_controller: opendaylight + odl_version: nitrogen + tacker: true + congress: true + sfc: false + vpn: false + sriov: em2 + performance: + Controller: + kernel: + Compute: + kernel: + hugepagesz: 2M + hugepages: 2048 + intel_iommu: 'on' + iommu: pt diff --git a/config/deploy/os-odl-sriov-noha.yaml b/config/deploy/os-odl-sriov-noha.yaml new file mode 100644 index 00000000..52b5aa18 --- /dev/null +++ b/config/deploy/os-odl-sriov-noha.yaml @@ -0,0 +1,21 @@ +--- +global_params: + ha_enabled: false + +deploy_options: + sdn_controller: opendaylight + odl_version: nitrogen + tacker: true + congress: true + sfc: false + vpn: false + sriov: em2 + performance: + Controller: + kernel: + Compute: + kernel: + hugepagesz: 2M + hugepages: 2048 + intel_iommu: 'on' + iommu: pt diff --git a/config/deploy/os-ovn-nofeature-ha.yaml b/config/deploy/os-ovn-nofeature-ha.yaml new file mode 100644 index 00000000..6c42cad9 --- /dev/null +++ b/config/deploy/os-ovn-nofeature-ha.yaml @@ -0,0 +1,15 @@ +--- +global_params: + ha_enabled: true + patches: + undercloud: + - change-id: Ic08ff58b10d4fa7116163be1f7fce57879cee8c5 + project: openstack/tripleo-common + +deploy_options: + containers: true + sdn_controller: ovn + tacker: false + congress: false + sfc: false + vpn: false diff --git a/config/deploy/os-ovn-rocky-ha.yaml b/config/deploy/os-ovn-rocky-ha.yaml new file mode 100644 index 00000000..a2c5a865 --- /dev/null +++ b/config/deploy/os-ovn-rocky-ha.yaml @@ -0,0 +1,17 @@ +--- +global_params: + ha_enabled: true + patches: + undercloud: + - change-id: Ic08ff58b10d4fa7116163be1f7fce57879cee8c5 + project: openstack/tripleo-common + branch: master + +deploy_options: + containers: true + os_version: rocky + sdn_controller: ovn + tacker: false + congress: false + sfc: false + vpn: false diff --git a/config/network/network_settings.yaml b/config/network/network_settings.yaml index fe11a9b5..fee6b500 100644 --- a/config/network/network_settings.yaml +++ b/config/network/network_settings.yaml @@ -57,6 +57,10 @@ syslog: server: 10.128.1.24 transport: 'tcp' +# http(s) proxy settings added to /etc/environment of uc and oc nodes +# http_proxy: http://proxy.server:8080 +# https_proxy: https://proxy.server:8081 + # Common network settings networks: # Admin configuration (pxe and jumpstart) @@ -112,6 +116,12 @@ networks: mtu: 1500 # Tenant network Overlay segmentation ID range: # VNI, VLAN-ID, etc. + # VLAN config should follow the pattern of neutron ml2 network_vlan_ranges + # allowed patterns are <physical_network> or + # <physical_network>:<vlan_min>:<vlan_max> + # Note that for VLAN config, physnet 'datacentre:1:1000' is used for + # external networks by default and will be automatically added to + # Neutron config if the range specified here does not include datacentre. overlay_id_range: 2,65535 # Tenant network segmentation type: @@ -176,8 +186,11 @@ networks: nic_mapping: # Mapping for compute profile (nodes assigned as Compute nodes) compute: - # Physical interface type (interface or bond) - phys_type: interface + # Physical interface type (ovs_bridge, interface or bond) + # Note that this phys_type for external network will be changed + # to vpp_interface for odl_fdio scenarios and linux_bridge for + # nosdn_fdio scenarios. + phys_type: ovs_bridge # VLAN tag to use with this NIC vlan: native # Physical NIC members of this mapping @@ -186,7 +199,10 @@ networks: - eth2 # Mapping for controller profile (nodes assigned as Controller nodes) controller: - phys_type: interface + # Note that this phys_type for external network will be changed + # to vpp_interface for odl_fdio scenarios and linux_bridge for + # nosdn_fdio scenarios. + phys_type: ovs_bridge vlan: native members: - eth2 diff --git a/config/network/network_settings_vpp.yaml b/config/network/network_settings_csit.yaml index 2f6bba5e..75271140 100644 --- a/config/network/network_settings_vpp.yaml +++ b/config/network/network_settings_csit.yaml @@ -57,6 +57,10 @@ syslog: server: 10.128.1.24 transport: 'tcp' +# http(s) proxy settings added to /etc/environment of uc and oc nodes +# http_proxy: http://proxy.server:8080 +# https_proxy: https://proxy.server:8081 + # Common network settings networks: # Admin configuration (pxe and jumpstart) @@ -105,13 +109,19 @@ networks: # Tenant network configuration tenant: - enabled: true + enabled: false # Subnet in CIDR format 192.168.1.0/24 cidr: 11.0.0.0/24 # Tenant network MTU mtu: 1500 # Tenant network Overlay segmentation ID range: # VNI, VLAN-ID, etc. + # VLAN config should follow the pattern of neutron ml2 network_vlan_ranges + # allowed patterns are <physical_network> or + # <physical_network>:<vlan_min>:<vlan_max> + # Note that for VLAN config, physnet 'datacentre:1:1000' is used for + # external networks by default and will be automatically added to + # Neutron config if the range specified here does not include datacentre. overlay_id_range: 2,65535 # Tenant network segmentation type: @@ -123,6 +133,9 @@ networks: compute: # Physical interface type (interface/bond) phys_type: interface + # UIO driver to use for DPDK scenarios. + # The value is ignored for non-DPDK scenarios. + uio_driver: uio_pci_generic # VLAN tag to use with this NIC vlan: native # Physical NIC members of this mapping @@ -142,7 +155,7 @@ networks: # Can contain 1 or more external networks external: - public: - enabled: true + enabled: false # Public network MTU mtu: 1500 # Network settings for the Installer VM on external network @@ -248,7 +261,7 @@ networks: # Storage network configuration storage: - enabled: true + enabled: false # Subnet in CIDR format cidr: 12.0.0.0/24 # Storage network MTU diff --git a/config/network/network_settings_tenant_vlan.yaml b/config/network/network_settings_tenant_vlan.yaml new file mode 100644 index 00000000..e1f009fa --- /dev/null +++ b/config/network/network_settings_tenant_vlan.yaml @@ -0,0 +1,333 @@ +--- +# This configuration file defines Network Environment for a +# Baremetal Deployment of OPNFV. It contains default values +# for 5 following networks: +# +# - admin +# - tenant* +# - external* +# - storage* +# - api* +# *) optional networks +# +# Optional networks will be consolidated with the admin network +# if not explicitly configured. +# +# See short description of the networks in the comments below. +# +# "admin" is the short name for Control Plane Network. +# This network should be IPv4 even it is an IPv6 deployment +# IPv6 does not have PXE boot support. +# During OPNFV deployment it is used for node provisioning which will require +# PXE booting as well as running a DHCP server on this network. Be sure to +# disable any other DHCP/TFTP server on this network. +# +# "tenant" is the network used for tenant traffic. +# +# "external" is the network which should have internet or external +# connectivity. External OpenStack networks will be configured to egress this +# network. There can be multiple external networks, but only one assigned as +# "public" which OpenStack public API's will register. +# +# "storage" is the network for storage I/O. +# +# "api" is an optional network for splitting out OpenStack service API +# communication. This should be used for IPv6 deployments. + + +# Meta data for the network configuration +network-config-metadata: + title: LF-POD-1 Network config + version: 0.1 + created: Mon Dec 28 2015 + comment: None + +# DNS Settings +dns-domain: opnfvlf.org +dns-search: opnfvlf.org +dns_nameservers: + - 8.8.8.8 + - 8.8.4.4 +# NTP servers +ntp: + - 0.se.pool.ntp.org + - 1.se.pool.ntp.org +# Syslog server +syslog: + server: 10.128.1.24 + transport: 'tcp' + +# http(s) proxy settings added to /etc/environment of uc and oc nodes +# http_proxy: http://proxy.server:8080 +# https_proxy: https://proxy.server:8081 + +# Common network settings +networks: + # Admin configuration (pxe and jumpstart) + admin: + enabled: true + # Network settings for the Installer VM on admin network + installer_vm: + # Indicates if this VM will be bridged to an interface, or to a bond + nic_type: interface + # Interfaces to bridge for installer VM (use multiple values for bond) + members: + - em1 + # VLAN tag to use for this network on Installer VM, native means none + vlan: native + # IP to assign to Installer VM on this network + ip: 192.0.2.1 + # Usable ip range for the overcloud node IPs (including VIPs) + # Last IP is used for host bridge (i.e. br-admin). + # If empty entire range is usable. + # Cannot overlap with dhcp_range or introspection_range. + overcloud_ip_range: + - 192.0.2.51 + - 192.0.2.99 + # Gateway (only needed when public_network is disabled) + gateway: 192.0.2.1 + # Subnet in CIDR format 192.168.1.0/24 + cidr: 192.0.2.0/24 + # DHCP range for the admin network, automatically provisioned if empty + dhcp_range: + - 192.0.2.2 + - 192.0.2.50 + # Mapping of network configuration for Overcloud Nodes + nic_mapping: + # Mapping for compute profile (nodes assigned as Compute nodes) + compute: + # Physical interface type (interface or bond) + phys_type: interface + # Physical NIC members (Single value allowed for phys_type: interface) + members: + - eth0 + # Mapping for controller profile (nodes assigned as Controller nodes) + controller: + phys_type: interface + members: + - eth0 + + # Tenant network configuration + tenant: + enabled: true + # Subnet in CIDR format 192.168.1.0/24 + cidr: 11.0.0.0/24 + # Tenant network MTU + mtu: 1500 + # Tenant network Overlay segmentation ID range: + # VNI, VLAN-ID, etc. + # VLAN config should follow the pattern of neutron ml2 network_vlan_ranges + # allowed patterns are <physical_network> or + # <physical_network>:<vlan_min>:<vlan_max> + # Note that for VLAN config, physnet 'datacentre:1:1000' is used for + # external networks by default and will be automatically added to + # Neutron config if the range specified here does not include datacentre. + overlay_id_range: vlan:500:525 + + # Tenant network segmentation type: + # vlan, vxlan, gre + segmentation_type: vlan + # Mapping of network configuration for Overcloud Nodes + nic_mapping: + # Mapping for compute profile (nodes assigned as Compute nodes) + compute: + # Physical interface type (interface/bond) + phys_type: interface + # UIO driver to use for DPDK scenarios. + # The value is ignored for non-DPDK scenarios. + uio_driver: uio_pci_generic + # VLAN tag to use with this NIC + vlan: native + # Physical NIC members of this mapping + # Single value allowed for phys_type: interface + members: + # Note logical name like nic1 not valid for fdio deployment yet. + - eth1 + # Mapping for controller profile (nodes assigned as Controller nodes) + controller: + # Physical interface type (interface/bond) + phys_type: interface + vlan: native + # Note: logicial names like nic1 are not valid for fdio deployment yet. + members: + - eth1 + + # Can contain 1 or more external networks + external: + - public: + enabled: true + # Public network MTU + mtu: 1500 + # Network settings for the Installer VM on external network + # (note only valid on 'public' external network) + installer_vm: + # Indicates if this VM will be bridged to an interface, or to a bond + nic_type: interface + vlan: native + # Interfaces to bridge for installer VM (use multiple values for bond) + members: + - em1 + # IP to assign to Installer VM on this network + ip: 192.168.37.1 + cidr: 192.168.37.0/24 + gateway: 192.168.37.1 + # Range to allocate to floating IPs for the public network with Neutron + floating_ip_range: + - 192.168.37.200 + - 192.168.37.220 + # Usable ip range for the overcloud node IPs (including VIPs) + # Last IP will be used for host bridge (i.e. br-public). + # If empty entire range is usable. + # Cannot overlap with dhcp_range or introspection_range. + overcloud_ip_range: + - 192.168.37.10 + - 192.168.37.199 + # Mapping of network configuration for Overcloud Nodes + nic_mapping: + # Mapping for compute profile (nodes assigned as Compute nodes) + compute: + # Physical interface type (interface or bond) + # Note that this phys_type for external network will be changed + # to vpp_interface for odl_fdio scenarios and linux_bridge for + # nosdn_fdio scenarios. + phys_type: ovs_bridge + # VLAN tag to use with this NIC + vlan: native + # Physical NIC members of this mapping + # Single value allowed for phys_type: interface + members: + - eth2 + # Mapping for controller profile (nodes assigned as Controller nodes) + controller: + # Note that this phys_type for external network will be changed + # to vpp_interface for odl_fdio scenarios and linux_bridge for + # nosdn_fdio scenarios. + phys_type: ovs_bridge + vlan: native + members: + - eth2 + # External network to be created in OpenStack by Services tenant + external_overlay: + name: Public_internet + type: flat + gateway: 192.168.37.1 + # another external network + # This is an example and not yet supported + - private_cloud: + enabled: false + mtu: 1500 + # Network settings for the Installer VM on external network + # note only valid on 'public' external network + installer_vm: + # Indicates if this VM will be bridged to an interface, or to a bond + nic_type: interface + vlan: 101 + # Interfaces to bridge for installer VM (use multiple values for bond) + members: + - em1 + # IP to assign to Installer VM on this network + ip: 192.168.38.1 + cidr: 192.168.38.0/24 + gateway: 192.168.38.1 + # Range to allocate to floating IPs for the public network with Neutron + floating_ip_range: + - 192.168.38.200 + - 192.168.38.220 + # Usable IP range for overcloud nodes (including VIPs)i + # usually this is a shared subnet. + # Cannot overlap with dhcp_range or introspection_range. + overcloud_ip_range: + - 192.168.38.10 + - 192.168.38.199 + # Mapping of network configuration for Overcloud Nodes + nic_mapping: + # Mapping for compute profile (nodes assigned as Compute nodes) + compute: + # Physical interface type (interface or bond) + phys_type: interface + # VLAN tag to use with this NIC + vlan: 101 + # Physical NIC members of this mappingi + # Single value allowed for phys_type: interface + # Note: logical names like nic1 are not valid for fdio deployment yet. + members: + - eth3 + # Mapping for controller profile (nodes assigned as Controller nodes) + controller: + phys_type: interface + vlan: 101 + members: + - eth3 + # External network to be created in OpenStack by Services tenant + external_overlay: + name: private_cloud + type: vlan + segmentation_id: 101 + gateway: 192.168.38.1 + + # Storage network configuration + storage: + enabled: true + # Subnet in CIDR format + cidr: 12.0.0.0/24 + # Storage network MTU + mtu: 1500 + # Mapping of network configuration for Overcloud Nodes + nic_mapping: + # Mapping for compute profile (nodes assigned as Compute nodes) + compute: + # Physical interface type (interface or bond) + phys_type: interface + # VLAN tag to use with this NIC + vlan: native + # Physical NIC members of this mapping + # Single value allowed for phys_type: interface + members: + # Note logical names like nic1 not valid for fdio deployment yet. + - eth3 + # Mapping for controller profile (nodes assigned as Controller nodes) + controller: + phys_type: interface + vlan: native + members: + - eth3 + + api: + # API network configuration + enabled: false + # Subnet in CIDR format + cidr: fd00:fd00:fd00:4000::/64 + # VLAN tag to use for Overcloud hosts on this network + vlan: 13 + # Api network MTU + mtu: 1500 + # Mapping of network configuration for Overcloud Nodes + nic_mapping: + # Mapping for compute profile (nodes assigned as Compute nodes) + compute: + # Physical interface type (interface or bond) + phys_type: interface + # VLAN tag to use with this NIC + vlan: native + # Physical NIC members of this mapping + # Single value allowed for phys_type: interface + # Note logical names like nic1 not valid for fdio deployment yet. + members: + - eth4 + # Mapping for controller profile (nodes assigned as Controller nodes) + controller: + phys_type: interface + vlan: native + members: + - eth4 + +# Apex specific settings +apex: + networks: + admin: + # Range used for introspection phase (examining nodes). + # This cannot overlap with dhcp_range or overcloud_ip_range. + # for the overcloud default external network + introspection_range: + - 192.0.2.100 + - 192.0.2.120 diff --git a/config/network/network_settings_v6.yaml b/config/network/network_settings_v6.yaml index 7dddf343..71b0b272 100644 --- a/config/network/network_settings_v6.yaml +++ b/config/network/network_settings_v6.yaml @@ -57,6 +57,10 @@ syslog: server: 10.128.1.24 transport: 'tcp' +# http(s) proxy settings added to /etc/environment of uc and oc nodes +# http_proxy: http://proxy.server:8080 +# https_proxy: https://proxy.server:8081 + # Common network settings networks: # Admin configuration (pxe and jumpstart) @@ -112,6 +116,12 @@ networks: mtu: 1500 # Tenant network Overlay segmentation ID range: # VNI, VLAN-ID, etc. + # VLAN config should follow the pattern of neutron ml2 network_vlan_ranges + # allowed patterns are <physical_network> or + # <physical_network>:<vlan_min>:<vlan_max> + # Note that for VLAN config, physnet 'datacentre:1:1000' is used for + # external networks by default and will be automatically added to + # Neutron config if the range specified here does not include datacentre. overlay_id_range: 2,65535 # Tenant network segmentation type: @@ -170,7 +180,7 @@ networks: # Mapping for compute profile (nodes assigned as Compute nodes) compute: # Physical interface type (interface or bond) - phys_type: interface + phys_type: ovs_bridge # VLAN tag to use with this NIC vlan: native # Physical NIC members of this mapping @@ -179,7 +189,7 @@ networks: - nic3 # Mapping for controller profile (nodes assigned as Controller nodes) controller: - phys_type: interface + phys_type: ovs_bridge vlan: native members: - nic3 diff --git a/config/network/network_settings_vlans.yaml b/config/network/network_settings_vlans.yaml index 345dbbde..29cd193d 100644 --- a/config/network/network_settings_vlans.yaml +++ b/config/network/network_settings_vlans.yaml @@ -57,6 +57,10 @@ syslog: server: 10.128.1.24 transport: 'tcp' +# http(s) proxy settings added to /etc/environment of uc and oc nodes +# http_proxy: http://proxy.server:8080 +# https_proxy: https://proxy.server:8081 + # Common network settings networks: # Admin configuration (pxe and jumpstart) |