Switch to use native ansible for remaining CI nic configs

This switches the jobs using:
- multiple-nics-ipv6
- public-bond

Depends-On: https://review.opendev.org/756425
Change-Id: I64f21941e8373481963115771ddf70ff7c8b639a
This commit is contained in:
Rabi Mishra 2020-10-07 10:08:14 +05:30
parent 0ffabb4fe3
commit 29735474fb
2 changed files with 24 additions and 16 deletions

View File

@ -1,12 +1,16 @@
resource_registry:
OS::TripleO::BlockStorage::Net::SoftwareConfig: nic-configs/cinder-storage.yaml
OS::TripleO::Compute::Net::SoftwareConfig: nic-configs/compute-dvr.yaml
OS::TripleO::Controller::Net::SoftwareConfig: nic-configs/controller.yaml
OS::TripleO::ObjectStorage::Net::SoftwareConfig: nic-configs/swift-storage.yaml
OS::TripleO::CephStorage::Net::SoftwareConfig: nic-configs/ceph-storage.yaml
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

View File

@ -1,12 +1,16 @@
resource_registry:
OS::TripleO::BlockStorage::Net::SoftwareConfig: nic-configs/cinder-storage.yaml
OS::TripleO::Compute::Net::SoftwareConfig: nic-configs/compute.yaml
OS::TripleO::Controller::Net::SoftwareConfig: nic-configs/controller.yaml
OS::TripleO::ObjectStorage::Net::SoftwareConfig: nic-configs/swift-storage.yaml
OS::TripleO::CephStorage::Net::SoftwareConfig: nic-configs/ceph-storage.yaml
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