diff --git a/ci/environments/multinode-containers.yaml b/ci/environments/multinode-containers.yaml index 48ac25e79b..ff7f8eca34 100644 --- a/ci/environments/multinode-containers.yaml +++ b/ci/environments/multinode-containers.yaml @@ -3,9 +3,7 @@ resource_registry: parameter_defaults: ControllerNetworkConfigTemplate: 'templates/ci/multinode.j2' - ControllerNetworkConfigWithAnsible: true ComputeNetworkConfigTemplate: 'templates/ci/multinode.j2' - ComputeNetworkConfigWithAnsible: true ControllerServices: - OS::TripleO::Services::CACerts - OS::TripleO::Services::ContainerImagePrepare diff --git a/ci/environments/network/multiple-nics-ipv6/network-environment.yaml b/ci/environments/network/multiple-nics-ipv6/network-environment.yaml index 7b76e4fe3a..818a1ddbc4 100644 --- a/ci/environments/network/multiple-nics-ipv6/network-environment.yaml +++ b/ci/environments/network/multiple-nics-ipv6/network-environment.yaml @@ -1,16 +1,10 @@ parameter_defaults: ControllerNetworkConfigTemplate: 'templates/ci/multiple_nics_ipv6.j2' - ControllerNetworkConfigWithAnsible: true ComputeNetworkConfigTemplate: 'templates/ci/multiple_nics_ipv6.j2' - ComputeNetworkConfigWithAnsible: true BlockStorageNetworkConfigTemplate: 'templates/ci/multiple_nics_ipv6.j2' - BlockStorageNetworkConfigWithAnsible: true CellControllerNetworkConfigTemplate: 'templates/ci/multiple_nics_ipv6.j2' - CellControllerNetworkConfigWithAnsible: true ObjectStorageNetworkConfigTemplate: 'templates/ci/multiple_nics_ipv6.j2' - ObjectStorageNetworkConfigWithAnsible: true CephStorageNetworkConfigTemplate: 'templates/ci/multiple_nics_ipv6.j2' - CephStorageNetworkConfigWithAnsible: true ExternalNetCidr: 2001:db8:fd00:1000::/64 ExternalAllocationPools: [{"start": "2001:db8:fd00:1000::10", "end": "2001:db8:fd00:1000:ffff:ffff:ffff:fffe"}] ExternalInterfaceDefaultRoute: 2001:db8:fd00:1000::1 diff --git a/ci/environments/network/multiple-nics/network-environment.yaml b/ci/environments/network/multiple-nics/network-environment.yaml index 7dbc220c04..a57fa59258 100644 --- a/ci/environments/network/multiple-nics/network-environment.yaml +++ b/ci/environments/network/multiple-nics/network-environment.yaml @@ -1,16 +1,10 @@ parameter_defaults: ControllerNetworkConfigTemplate: 'templates/ci/multiple_nics.j2' - ControllerNetworkConfigWithAnsible: true ComputeNetworkConfigTemplate: 'templates/ci/multiple_nics.j2' - ComputeNetworkConfigWithAnsible: true BlockStorageNetworkConfigTemplate: 'templates/ci/multiple_nics.j2' - BlockStorageNetworkConfigWithAnsible: true CellControllerNetworkConfigTemplate: 'templates/ci/multiple_nics.j2' - CellControllerNetworkConfigWithAnsible: true ObjectStorageNetworkConfigTemplate: 'templates/ci/multiple_nics.j2' - ObjectStorageNetworkConfigWithAnsible: true CephStorageNetworkConfigTemplate: 'templates/ci/multiple_nics.j2' - CephStorageNetworkConfigWithAnsible: true ExternalNetCidr: 10.0.0.0/24 ExternalAllocationPools: [{"start": "10.0.0.10", "end": "10.0.0.50"}] ExternalInterfaceDefaultRoute: 10.0.0.1 diff --git a/ci/environments/network/public-bond/network-environment.yaml b/ci/environments/network/public-bond/network-environment.yaml index 4b916de9ed..527042f922 100644 --- a/ci/environments/network/public-bond/network-environment.yaml +++ b/ci/environments/network/public-bond/network-environment.yaml @@ -1,16 +1,10 @@ parameter_defaults: ControllerNetworkConfigTemplate: 'templates/ci/public_bond.j2' - ControllerNetworkConfigWithAnsible: true ComputeNetworkConfigTemplate: 'templates/ci/public_bond.j2' - ComputeNetworkConfigWithAnsible: true BlockStorageNetworkConfigTemplate: 'templates/ci/public_bond.j2' - BlockStorageNetworkConfigWithAnsible: true CellControllerNetworkConfigTemplate: 'templates/ci/public_bond.j2' - CellControllerNetworkConfigWithAnsible: true ObjectStorageNetworkConfigTemplate: 'templates/ci/public_bond.j2' - ObjectStorageNetworkConfigWithAnsible: true CephStorageNetworkConfigTemplate: 'templates/ci/public_bond.j2' - CephStorageNetworkConfigWithAnsible: true ExternalNetCidr: 10.0.0.0/24 ExternalAllocationPools: [{"start": "10.0.0.10", "end": "10.0.0.50"}] ExternalInterfaceDefaultRoute: 10.0.0.1 diff --git a/ci/environments/scenario000-multinode-containers.yaml b/ci/environments/scenario000-multinode-containers.yaml index 8f203b01c9..f42f9921ae 100644 --- a/ci/environments/scenario000-multinode-containers.yaml +++ b/ci/environments/scenario000-multinode-containers.yaml @@ -1,8 +1,6 @@ parameter_defaults: ControllerNetworkConfigTemplate: 'templates/ci/multinode.j2' - ControllerNetworkConfigWithAnsible: true ComputeNetworkConfigTemplate: 'templates/ci/multinode.j2' - ComputeNetworkConfigWithAnsible: true ControllerServices: - OS::TripleO::Services::CACerts - OS::TripleO::Services::ContainerImagePrepare diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index b2b1842953..2039af0860 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -29,9 +29,7 @@ resource_registry: parameter_defaults: ControllerNetworkConfigTemplate: 'templates/ci/multinode.j2' - ControllerNetworkConfigWithAnsible: true ComputeNetworkConfigTemplate: 'templates/ci/multinode.j2' - ComputeNetworkConfigWithAnsible: true ControllerServices: - OS::TripleO::Services::CACerts - OS::TripleO::Services::Clustercheck diff --git a/ci/environments/scenario007-multinode-containers.yaml b/ci/environments/scenario007-multinode-containers.yaml index 7d03a62667..826933a018 100644 --- a/ci/environments/scenario007-multinode-containers.yaml +++ b/ci/environments/scenario007-multinode-containers.yaml @@ -24,9 +24,7 @@ resource_registry: OS::TripleO::Services::BlockStorageCinderVolume: OS::Heat::None parameter_defaults: ControllerNetworkConfigTemplate: 'templates/ci/multinode.j2' - ControllerNetworkConfigWithAnsible: true ComputeNetworkConfigTemplate: 'templates/ci/multinode.j2' - ComputeNetworkConfigWithAnsible: true ControllerServices: - OS::TripleO::Services::CACerts - OS::TripleO::Services::Clustercheck diff --git a/ci/environments/scenario010-multinode-containers.yaml b/ci/environments/scenario010-multinode-containers.yaml index 004f37beba..719486ea34 100644 --- a/ci/environments/scenario010-multinode-containers.yaml +++ b/ci/environments/scenario010-multinode-containers.yaml @@ -26,9 +26,7 @@ resource_registry: parameter_defaults: ControllerNetworkConfigTemplate: 'templates/ci/multinode.j2' - ControllerNetworkConfigWithAnsible: true ComputeNetworkConfigTemplate: 'templates/ci/multinode.j2' - ComputeNetworkConfigWithAnsible: true ControllerServices: - OS::TripleO::Services::CACerts - OS::TripleO::Services::Clustercheck diff --git a/deployed-server/README.rst b/deployed-server/README.rst index b31603c2fc..11ab730885 100644 --- a/deployed-server/README.rst +++ b/deployed-server/README.rst @@ -50,8 +50,6 @@ controllers, and the net_config_static.j2 template could be used for computes by specifying: parameter_defaults: - ControllerNetworkConfigWithAnsible: true - ComputeNetworkConfigWithAnsible: true ControlleNetworkConfigTemplate: 'templates/net_config_static_bridge.j2' ComputeNetworkConfigTemplate: 'templates/net_config_static.j2' diff --git a/environments/deployed-server-environment.j2.yaml b/environments/deployed-server-environment.j2.yaml index c8095c061e..01be012d90 100644 --- a/environments/deployed-server-environment.j2.yaml +++ b/environments/deployed-server-environment.j2.yaml @@ -11,5 +11,4 @@ parameter_defaults: EnablePackageInstall: True {% for role in roles %} {{role.name}}NetworkConfigTemplate: 'templates/net_config_static_bridge.j2' - {{role.name}}NetworkConfigWithAnsible: true {% endfor %} diff --git a/environments/net-2-linux-bonds-with-vlans.j2.yaml b/environments/net-2-linux-bonds-with-vlans.j2.yaml index e7b5131f57..c1567a6ccd 100644 --- a/environments/net-2-linux-bonds-with-vlans.j2.yaml +++ b/environments/net-2-linux-bonds-with-vlans.j2.yaml @@ -18,5 +18,4 @@ parameter_defaults: {%- else %} {{role.name}}NetworkConfigTemplate: 'templates/2_linux_bonds_vlans/2_linux_bonds_vlans.j2' {%- endif %} - {{role.name}}NetworkConfigWithAnsible: true {%- endfor %} diff --git a/environments/net-bond-with-vlans.j2.yaml b/environments/net-bond-with-vlans.j2.yaml index d9633bc38b..ce77ef9e97 100644 --- a/environments/net-bond-with-vlans.j2.yaml +++ b/environments/net-bond-with-vlans.j2.yaml @@ -25,5 +25,4 @@ parameter_defaults: {%- else %} {{role.name}}NetworkConfigTemplate: 'templates/bonds_vlans/bonds_vlans.j2' {%- endif %} - {{role.name}}NetworkConfigWithAnsible: true {%- endfor %} diff --git a/environments/net-dpdkbond-with-vlans.j2.yaml b/environments/net-dpdkbond-with-vlans.j2.yaml index edd258a512..8eeb444b51 100644 --- a/environments/net-dpdkbond-with-vlans.j2.yaml +++ b/environments/net-dpdkbond-with-vlans.j2.yaml @@ -21,5 +21,4 @@ parameter_defaults: {%- else %} {{role.name}}NetworkConfigTemplate: 'templates/bonds_vlans/bonds_vlans_dpdk.j2' {%- endif %} - {{role.name}}NetworkConfigWithAnsible: true {%- endfor %} diff --git a/environments/net-multiple-nics-vlans.j2.yaml b/environments/net-multiple-nics-vlans.j2.yaml index 2bacdc6b1f..91e22c5b3a 100644 --- a/environments/net-multiple-nics-vlans.j2.yaml +++ b/environments/net-multiple-nics-vlans.j2.yaml @@ -19,5 +19,4 @@ parameter_defaults: {%- else %} {{role.name}}NetworkConfigTemplate: 'templates/multiple_nics_vlans/multiple_nics_vlans.j2' {%- endif %} - {{role.name}}NetworkConfigWithAnsible: true {%- endfor %} diff --git a/environments/net-multiple-nics.j2.yaml b/environments/net-multiple-nics.j2.yaml index 708bdd586d..38b620c1ff 100644 --- a/environments/net-multiple-nics.j2.yaml +++ b/environments/net-multiple-nics.j2.yaml @@ -25,5 +25,4 @@ parameter_defaults: {%- else %} {{role.name}}NetworkConfigTemplate: 'templates/multiple_nics/multiple_nics.j2' {%- endif %} - {{role.name}}NetworkConfigWithAnsible: true {%- endfor %} diff --git a/environments/net-single-nic-linux-bridge-with-vlans.j2.yaml b/environments/net-single-nic-linux-bridge-with-vlans.j2.yaml index c550cbe423..04d611b44f 100644 --- a/environments/net-single-nic-linux-bridge-with-vlans.j2.yaml +++ b/environments/net-single-nic-linux-bridge-with-vlans.j2.yaml @@ -17,5 +17,4 @@ parameter_defaults: {%- else %} {{role.name}}NetworkConfigTemplate: 'templates/single_nic_linux_bridge_vlans/single_nic_linux_bridge_vlans.j2' {%- endif %} - {{role.name}}NetworkConfigWithAnsible: true {%- endfor %} diff --git a/environments/net-single-nic-with-vlans-no-external.j2.yaml b/environments/net-single-nic-with-vlans-no-external.j2.yaml index c23ca5a67e..4502806323 100644 --- a/environments/net-single-nic-with-vlans-no-external.j2.yaml +++ b/environments/net-single-nic-with-vlans-no-external.j2.yaml @@ -24,5 +24,4 @@ parameter_defaults: {%- else %} {{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/controller_no_external.j2' {%- endif %} - {{role.name}}NetworkConfigWithAnsible: true {%- endfor %} diff --git a/environments/net-single-nic-with-vlans.j2.yaml b/environments/net-single-nic-with-vlans.j2.yaml index 04117ee818..589b3a609c 100644 --- a/environments/net-single-nic-with-vlans.j2.yaml +++ b/environments/net-single-nic-with-vlans.j2.yaml @@ -23,5 +23,4 @@ parameter_defaults: {%- else %} {{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/single_nic_vlans.j2' {%- endif %} - {{role.name}}NetworkConfigWithAnsible: true {%- endfor %} diff --git a/environments/neutron-ovs-dvr.yaml b/environments/neutron-ovs-dvr.yaml index abe9a78def..5d427ea319 100644 --- a/environments/neutron-ovs-dvr.yaml +++ b/environments/neutron-ovs-dvr.yaml @@ -19,7 +19,6 @@ resource_registry: # With using default template values, the Compute nodes also need the br-ex # bridge to be connected to a physical network. - ComputeNetworkConfigWithAnsible: true ComputeNetworkConfigTemplate: 'templates/net_config_bridge.j2' # Disable OVN services diff --git a/environments/services/neutron-ovs-dvr.yaml b/environments/services/neutron-ovs-dvr.yaml index 6d0f2668f9..c1aa329c19 100644 --- a/environments/services/neutron-ovs-dvr.yaml +++ b/environments/services/neutron-ovs-dvr.yaml @@ -14,7 +14,6 @@ resource_registry: OS::TripleO::Services::NeutronL3Agent: ../../deployment/neutron/neutron-l3-container-puppet.yaml OS::TripleO::Services::ComputeNeutronL3Agent: ../../deployment/neutron/neutron-l3-container-puppet.yaml OS::TripleO::Services::ComputeNeutronMetadataAgent: ../../deployment/neutron/neutron-metadata-container-puppet.yaml - ComputeDVRNetworkConfigWithAnsible: true ComputeDVRNetworkConfigTemplate: 'templates/net_config_bridge.j2' # Disable OVN services diff --git a/environments/standalone/standalone-overcloud.yaml b/environments/standalone/standalone-overcloud.yaml index 01d73b4e7a..3753023e24 100644 --- a/environments/standalone/standalone-overcloud.yaml +++ b/environments/standalone/standalone-overcloud.yaml @@ -46,10 +46,6 @@ parameter_defaults: # Type: string StandaloneNetworkConfigTemplate: templates/net_config_bridge.j2 - # Standalone NetworkConfig with ansible flag - # Type: boolean - StandaloneNetworkConfigWithAnsible: True - # How many replicas to use in the swift rings. # Type: number SwiftReplicas: 1 diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml index ea81f7301f..4d16fea0df 100644 --- a/environments/standalone/standalone-tripleo.yaml +++ b/environments/standalone/standalone-tripleo.yaml @@ -56,10 +56,6 @@ parameter_defaults: # Type: string StandaloneNetworkConfigTemplate: templates/standalone.j2 - # Standalone NetworkConfig with ansible flag - # Type: boolean - StandaloneNetworkConfigWithAnsible: True - # How many replicas to use in the swift rings. # Type: number SwiftReplicas: 1 diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml index c3d4d2e706..26dccbe180 100644 --- a/environments/undercloud.yaml +++ b/environments/undercloud.yaml @@ -181,7 +181,6 @@ parameter_defaults: UndercloudCtlplaneSubnets: {} UndercloudCtlplaneLocalSubnet: 'ctlplane-subnet' UndercloudNetworkConfigTemplate: 'templates/undercloud.j2' - UndercloudNetworkConfigWithAnsible: true MistralDockerGroup: true PasswordAuthentication: 'yes' HeatEngineOptVolumes: diff --git a/environments/undercloud/undercloud-minion.yaml b/environments/undercloud/undercloud-minion.yaml index fb6474f2c1..3ce95a4618 100644 --- a/environments/undercloud/undercloud-minion.yaml +++ b/environments/undercloud/undercloud-minion.yaml @@ -108,10 +108,6 @@ parameter_defaults: # Type: string UndercloudMinionNetworkConfigTemplate: templates/undercloud.j2 - # UndercloudMinion NetworkConfig with ansible flag - # Type: boolean - UndercloudMinionNetworkConfigWithAnsible: True - resource_registry: OS::TripleO::Network::Ports::ControlPlaneVipPort: OS::Heat::None OS::TripleO::OVNMacAddressNetwork: OS::Heat::None diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index 51adb07a91..25c5f5c14d 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -213,6 +213,11 @@ parameters: description: The balance-tcp bond mode is known to cause packet loss and should not be used in BondInterfaceOvsOptions. + NetworkConfigWithAnsible: + description: NetworkConfig with ansible flag + type: boolean + default: True + # Jinja loop for Role in role_data.yaml {% for role in roles %} @@ -233,10 +238,6 @@ parameters: description: {{role.name}} NetworkConfig Template type: string default: '' - {{role.name}}NetworkConfigWithAnsible: - description: {{role.name}} NetworkConfig with ansible flag - type: boolean - default: False {{role.name}}ExtraConfig: default: {} description: | @@ -1041,7 +1042,7 @@ resources: {%- endfor %} service_metadata_settings: {get_attr: [{{role.name}}ServiceChainRoleData, value, service_metadata_settings]} tripleo_network_config_template: {get_param: {{role.name}}NetworkConfigTemplate} - tripleo_network_config_with_ansible: {get_param: {{role.name}}NetworkConfigWithAnsible} + tripleo_network_config_with_ansible: {get_param: NetworkConfigWithAnsible} default_route_networks: {{role.default_route_networks}} networks_skip_config: {{role.networks_skip_config }} role_tags: {{role.tags}} diff --git a/releasenotes/notes/nic-config-with-ansible-default-cbcaedd0a5ad49b0.yaml b/releasenotes/notes/nic-config-with-ansible-default-cbcaedd0a5ad49b0.yaml new file mode 100644 index 0000000000..067a600acb --- /dev/null +++ b/releasenotes/notes/nic-config-with-ansible-default-cbcaedd0a5ad49b0.yaml @@ -0,0 +1,12 @@ +--- +features: + - | + This changes network config generation with ansible, using the provided + jinja templates for roles, the default. Too keep using old heat templates + for network config with``OS::TripleO::{{role.name}}::Net::SoftwareConfig`` + mappings, use ``NetworkConfigWithAnsible: false`` ``parameter_default`` + in an environment file. +deprecations: + - | + The old way of generating network configs with heat templates has been + deprecated. diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml index 5fb6b940dc..880fa64f15 100644 --- a/sample-env-generator/standalone.yaml +++ b/sample-env-generator/standalone.yaml @@ -46,7 +46,6 @@ environments: parameters: - AddVipsToEtcHosts - NetworkSafeDefaults - - StandaloneNetworkConfigWithAnsible - StandaloneNetworkConfigTemplate overcloud.yaml: parameters: @@ -58,7 +57,6 @@ environments: EnablePackageInstall: true SwiftReplicas: 1 SshFirewallAllowAll: true - StandaloneNetworkConfigWithAnsible: True StandaloneNetworkConfigTemplate: templates/standalone.j2 resource_registry: @@ -185,7 +183,6 @@ environments: - StandaloneHostnameFormat - StandaloneCount - OvercloudStandaloneFlavor - - StandaloneNetworkConfigWithAnsible - StandaloneNetworkConfigTemplate overcloud.yaml: parameters: @@ -194,7 +191,6 @@ environments: StandaloneCount: 1 OvercloudStandaloneFlavor: standalone SwiftReplicas: 1 - StandaloneNetworkConfigWithAnsible: True StandaloneNetworkConfigTemplate: templates/net_config_bridge.j2 resource_registry: @@ -299,7 +295,3 @@ parameters: description: Standalone NetworkConfigTemplate type: string default: '' - StandaloneNetworkConfigWithAnsible: - description: Standalone NetworkConfig with ansible flag - type: boolean - default: False diff --git a/sample-env-generator/undercloud-minion.yaml b/sample-env-generator/undercloud-minion.yaml index 140ffd7351..a472c7db61 100644 --- a/sample-env-generator/undercloud-minion.yaml +++ b/sample-env-generator/undercloud-minion.yaml @@ -29,7 +29,6 @@ environments: sample-env-generator/undercloud-minion.yaml: parameters: - UndercloudMinionNetworkConfigTemplate - - UndercloudMinionNetworkConfigWithAnsible deployment/ironic/ironic-conductor-container-puppet.yaml: parameters: - IronicCleaningDiskErase @@ -82,7 +81,6 @@ environments: IronicProvisioningNetwork: 'ctlplane' IronicRescuingNetwork: 'ctlplane' UndercloudMinionNetworkConfigTemplate: 'templates/undercloud.j2' - UndercloudMinionNetworkConfigWithAnsible: true resource_registry: # this network config is assumed by the tripleo deploy command OS::TripleO::Network::Ports::ControlPlaneVipPort: OS::Heat::None @@ -293,7 +291,3 @@ parameters: description: UndercloudMinion NetworkConfigTemplate type: string default: '' - UndercloudMinionNetworkConfigWithAnsible: - description: UndercloudMinion NetworkConfig with ansible flag - type: boolean - default: False