openstack/tripleo-heat-templates
Code Issues Proposed changes

Network config with ansible for ci jobs using multi-nics

Browse Source 
OVB jobs use a different multi-nic nic config. Generate that with
ansible.

Depends-On: https://review.opendev.org/754491
Change-Id: I5ea2615e773ee7656e85f172695ad08cd0312c56
This commit is contained in:
Rabi Mishra 2020-09-26 12:33:17 +05:30
parent 6ec975c113
commit 0d51947872
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ci/environments/network/multiple-nics/network-environment.yaml
View File

@ -1,13 +1,25 @@
resource_registry: resource_registry:
OS::TripleO::BlockStorage::Net::SoftwareConfig: nic-configs/cinder-storage.yaml OS::TripleO::BlockStorage::Net::SoftwareConfig: ../../../../net-config-noop.yaml
OS::TripleO::Compute::Net::SoftwareConfig: nic-configs/compute-dvr.yaml OS::TripleO::Compute::Net::SoftwareConfig: ../../../../net-config-noop.yaml
OS::TripleO::Controller::Net::SoftwareConfig: nic-configs/controller.yaml OS::TripleO::Controller::Net::SoftwareConfig: ../../../../net-config-noop.yaml
OS::TripleO::CellController::Net::SoftwareConfig: nic-configs/controller.yaml OS::TripleO::CellController::Net::SoftwareConfig: ../../../../net-config-noop.yaml
OS::TripleO::ObjectStorage::Net::SoftwareConfig: nic-configs/swift-storage.yaml OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../../../../net-config-noop.yaml
OS::TripleO::CephStorage::Net::SoftwareConfig: nic-configs/ceph-storage.yaml OS::TripleO::CephStorage::Net::SoftwareConfig: ../../../../net-config-noop.yaml
parameter_defaults: 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 ExternalNetCidr: 10.0.0.0/24
ExternalAllocationPools: [{"start": "10.0.0.10", "end": "10.0.0.50"}] ExternalAllocationPools: [{"start": "10.0.0.10", "end": "10.0.0.50"}]
ExternalInterfaceDefaultRoute: 10.0.0.1 ExternalInterfaceDefaultRoute: 10.0.0.1

9
net-config-noop.j2.yaml
View File

@ -72,12 +72,11 @@ parameters:
resources: resources:
OsNetConfigImpl: OsNetConfigImpl:
type: OS::Heat::StructuredConfig type: OS::Heat::Value
properties: properties:
group: apply-config value: {}
config: {}
outputs: outputs:
OS::stack_id: config:
description: The OsNetConfigImpl resource. description: The OsNetConfigImpl resource.
value: {get_resource: OsNetConfigImpl} value: {get_attr: [OsNetConfigImpl, value]}