Network config with ansible for all multinode jobs
This changes all multinode jobs to use ansible for network config rendering. Depends-On: https://review.opendev.org/754914 Change-Id: Icfa23c308736496b33e6fc4d4ccd62d6880f7b2b
This commit is contained in:
parent
0d51947872
commit
d02f9f1004
|
@ -1,9 +1,13 @@
|
|||
resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../../net-config-noop.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: ../../net-config-noop.yaml
|
||||
OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
|
||||
|
||||
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
|
||||
|
|
|
@ -1,8 +1,12 @@
|
|||
resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../../net-config-noop.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: ../../net-config-noop.yaml
|
||||
|
||||
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
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../../net-config-noop.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: ../../net-config-noop.yaml
|
||||
OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml
|
||||
OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
|
||||
OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
|
||||
|
@ -30,6 +30,10 @@ resource_registry:
|
|||
OS::TripleO::Services::HeatEngine: ../../deployment/heat/heat-engine-container-puppet.yaml
|
||||
|
||||
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
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../../net-config-noop.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: ../../net-config-noop.yaml
|
||||
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
|
||||
OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml
|
||||
OS::TripleO::Services::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
|
||||
|
@ -25,6 +25,10 @@ resource_registry:
|
|||
OS::TripleO::Services::CinderBackup: OS::Heat::None
|
||||
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
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../../net-config-noop.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: ../../net-config-noop.yaml
|
||||
OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml
|
||||
OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
|
||||
OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
|
||||
|
@ -27,6 +27,10 @@ resource_registry:
|
|||
OS::TripleO::Services::SwiftStorage: 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
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
# touching file so CI runs scenario012
|
||||
resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||
OS::TripleO::Services::NovaIronic: ../../deployment/nova/nova-ironic-container-puppet.yaml
|
||||
OS::TripleO::Services::IronicApi: ../../deployment/ironic/ironic-api-container-puppet.yaml
|
||||
OS::TripleO::Services::IronicConductor: ../../deployment/ironic/ironic-conductor-container-puppet.yaml
|
||||
|
|
Loading…
Reference in New Issue