openstack/tripleo-heat-templates
Code Issues Proposed changes

Add templates for custom network ci job

Browse Source 
We are creating a new featureset064 that will deploy overcloud with
custom network + custom overcloud name + IPA integration.

With this patch, Adding tht templates that we will use in fs064 for
overcloud deployment.

Depends-On: https://review.opendev.org/c/openstack/tripleo-ansible/+/818529
Change-Id: I5119a2c0103868fd481b57b890947b2881b86845
This commit is contained in:
Sandeep Yadav 2021-10-04 21:10:38 +05:30
parent 07c3455ad9
commit 2e4f35b07d
4 changed files with 359 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

266
ci/custom_ci_roles_data.yaml Normal file
View File

@ -0,0 +1,266 @@
###############################################################################
# File generated by TripleO
###############################################################################
###############################################################################
# Role: Controller #
###############################################################################
- name: Controller
description: |
Controller role that has all the controller services loaded and handles
Database, Messaging and Network functions.
CountDefault: 1
tags:
- primary
- controller
# Create external Neutron bridge for SNAT (and floating IPs when using
# ML2/OVS without DVR)
- external_bridge
networks:
ExternalCloud1:
subnet: external_cloud_1_subnet
InternalApiCloud1:
subnet: internal_api_cloud_1_subnet
StorageCloud1:
subnet: storage_cloud_1_subnet
StorageMgmtCloud1:
subnet: storage_mgmt_cloud_1_subnet
TenantCloud1:
subnet: tenant_cloud_1_subnet
# For systems with both IPv4 and IPv6, you may specify a gateway network for
# each, such as ['ControlPlane', 'External']
default_route_networks: ['ExternalCloud1']
HostnameFormatDefault: '%stackname%-controller-%index%'
RoleParametersDefault:
OVNCMSOptions: "enable-chassis-as-gw"
# Deprecated & backward-compatible values (FIXME: Make parameters consistent)
# Set uses_deprecated_params to True if any deprecated params are used.
uses_deprecated_params: True
deprecated_param_extraconfig: 'controllerExtraConfig'
deprecated_param_flavor: 'OvercloudControlFlavor'
deprecated_param_image: 'controllerImage'
deprecated_nic_config_name: 'controller.yaml'
update_serial: 1
ServicesDefault:
- OS::TripleO::Services::Aide
- OS::TripleO::Services::AodhApi
- OS::TripleO::Services::AodhEvaluator
- OS::TripleO::Services::AodhListener
- OS::TripleO::Services::AodhNotifier
- OS::TripleO::Services::AuditD
- OS::TripleO::Services::BarbicanApi
- OS::TripleO::Services::BarbicanBackendSimpleCrypto
- OS::TripleO::Services::BarbicanBackendDogtag
- OS::TripleO::Services::BarbicanBackendKmip
- OS::TripleO::Services::BarbicanBackendPkcs11Crypto
- OS::TripleO::Services::BootParams
- OS::TripleO::Services::CACerts
- OS::TripleO::Services::CeilometerAgentCentral
- OS::TripleO::Services::CeilometerAgentNotification
- OS::TripleO::Services::CephClient
- OS::TripleO::Services::CephExternal
- OS::TripleO::Services::CephGrafana
- OS::TripleO::Services::CephMds
- OS::TripleO::Services::CephMgr
- OS::TripleO::Services::CephMon
- OS::TripleO::Services::CephRbdMirror
- OS::TripleO::Services::CephRgw
- OS::TripleO::Services::CinderApi
- OS::TripleO::Services::CinderBackendDellSc
- OS::TripleO::Services::CinderBackendDellEMCPowerFlex
- OS::TripleO::Services::CinderBackendDellEMCPowermax
- OS::TripleO::Services::CinderBackendDellEMCPowerStore
- OS::TripleO::Services::CinderBackendDellEMCSc
- OS::TripleO::Services::CinderBackendDellEMCUnity
- OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
- OS::TripleO::Services::CinderBackendDellEMCVNX
- OS::TripleO::Services::CinderBackendDellEMCVxFlexOS
- OS::TripleO::Services::CinderBackendDellEMCXtremio
- OS::TripleO::Services::CinderBackendNetApp
- OS::TripleO::Services::CinderBackendPure
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendNVMeOF
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::Clustercheck
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::ContainerImagePrepare
- OS::TripleO::Services::DesignateApi
- OS::TripleO::Services::DesignateCentral
- OS::TripleO::Services::DesignateProducer
- OS::TripleO::Services::DesignateWorker
- OS::TripleO::Services::DesignateMDNS
- OS::TripleO::Services::DesignateSink
- OS::TripleO::Services::DesignateBind
- OS::TripleO::Services::Etcd
- OS::TripleO::Services::ExternalSwiftProxy
- OS::TripleO::Services::Frr
- OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::GnocchiApi
- OS::TripleO::Services::GnocchiMetricd
- OS::TripleO::Services::GnocchiStatsd
- OS::TripleO::Services::HAproxy
- OS::TripleO::Services::HeatApi
- OS::TripleO::Services::HeatApiCloudwatch
- OS::TripleO::Services::HeatApiCfn
- OS::TripleO::Services::HeatEngine
- OS::TripleO::Services::Horizon
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::IronicApi
- OS::TripleO::Services::IronicConductor
- OS::TripleO::Services::IronicInspector
- OS::TripleO::Services::IronicPxe
- OS::TripleO::Services::IronicNeutronAgent
- OS::TripleO::Services::Iscsid
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Keystone
- OS::TripleO::Services::LoginDefs
- OS::TripleO::Services::ManilaApi
- OS::TripleO::Services::ManilaBackendCephFs
- OS::TripleO::Services::ManilaBackendFlashBlade
- OS::TripleO::Services::ManilaBackendIsilon
- OS::TripleO::Services::ManilaBackendNetapp
- OS::TripleO::Services::ManilaBackendUnity
- OS::TripleO::Services::ManilaBackendVNX
- OS::TripleO::Services::ManilaBackendVMAX
- OS::TripleO::Services::ManilaScheduler
- OS::TripleO::Services::ManilaShare
- OS::TripleO::Services::Memcached
- OS::TripleO::Services::MetricsQdr
- OS::TripleO::Services::Multipathd
- OS::TripleO::Services::MySQL
- OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::NeutronApi
- OS::TripleO::Services::NeutronBgpVpnApi
- OS::TripleO::Services::NeutronSfcApi
- OS::TripleO::Services::NeutronCorePlugin
- OS::TripleO::Services::NeutronDhcpAgent
- OS::TripleO::Services::NeutronL2gwAgent
- OS::TripleO::Services::NeutronL2gwApi
- OS::TripleO::Services::NeutronL3Agent
- OS::TripleO::Services::NeutronLinuxbridgeAgent
- OS::TripleO::Services::NeutronMetadataAgent
- OS::TripleO::Services::NeutronOvsAgent
- OS::TripleO::Services::NeutronVppAgent
- OS::TripleO::Services::NeutronAgentsIBConfig
- OS::TripleO::Services::NovaApi
- OS::TripleO::Services::NovaConductor
- OS::TripleO::Services::NovaIronic
- OS::TripleO::Services::NovaMetadata
- OS::TripleO::Services::NovaScheduler
- OS::TripleO::Services::NovaVncProxy
- OS::TripleO::Services::ContainersLogrotateCrond
- OS::TripleO::Services::OctaviaApi
- OS::TripleO::Services::OctaviaDeploymentConfig
- OS::TripleO::Services::OctaviaHealthManager
- OS::TripleO::Services::OctaviaHousekeeping
- OS::TripleO::Services::OctaviaWorker
- OS::TripleO::Services::OpenStackClients
- OS::TripleO::Services::OVNDBs
- OS::TripleO::Services::OVNController
- OS::TripleO::Services::Pacemaker
- OS::TripleO::Services::PlacementApi
- OS::TripleO::Services::OsloMessagingRpc
- OS::TripleO::Services::OsloMessagingNotify
- OS::TripleO::Services::Podman
- OS::TripleO::Services::Rear
- OS::TripleO::Services::Redis
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Rsyslog
- OS::TripleO::Services::RsyslogSidecar
- OS::TripleO::Services::Securetty
- OS::TripleO::Services::Snmp
- OS::TripleO::Services::Sshd
- OS::TripleO::Services::SwiftProxy
- OS::TripleO::Services::SwiftDispersion
- OS::TripleO::Services::SwiftRingBuilder
- OS::TripleO::Services::SwiftStorage
- OS::TripleO::Services::Timesync
- OS::TripleO::Services::Timezone
- OS::TripleO::Services::TripleoFirewall
- OS::TripleO::Services::TripleoPackages
- OS::TripleO::Services::Tuned
- OS::TripleO::Services::Unbound
- OS::TripleO::Services::Vpp
###############################################################################
# Role: Compute #
###############################################################################
- name: Compute
description: |
Basic Compute Node role
CountDefault: 1
# Create external Neutron bridge (unset if using ML2/OVS without DVR)
tags:
- compute
- external_bridge
networks:
InternalApiCloud1:
subnet: internal_api_cloud_1_subnet
TenantCloud1:
subnet: tenant_cloud_1_subnet
StorageCloud1:
subnet: storage_cloud_1_subnet
HostnameFormatDefault: '%stackname%-novacompute-%index%'
RoleParametersDefault:
TunedProfileName: "virtual-host"
# Deprecated & backward-compatible values (FIXME: Make parameters consistent)
# Set uses_deprecated_params to True if any deprecated params are used.
# These deprecated_params only need to be used for existing roles and not for
# composable roles.
uses_deprecated_params: True
deprecated_param_image: 'NovaImage'
deprecated_param_extraconfig: 'NovaComputeExtraConfig'
deprecated_param_metadata: 'NovaComputeServerMetadata'
deprecated_param_scheduler_hints: 'NovaComputeSchedulerHints'
deprecated_param_ips: 'NovaComputeIPs'
deprecated_server_resource_name: 'NovaCompute'
deprecated_nic_config_name: 'compute.yaml'
update_serial: 25
ServicesDefault:
- OS::TripleO::Services::Aide
- OS::TripleO::Services::AuditD
- OS::TripleO::Services::BootParams
- OS::TripleO::Services::CACerts
- OS::TripleO::Services::CephClient
- OS::TripleO::Services::CephExternal
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::ComputeCeilometerAgent
- OS::TripleO::Services::ComputeNeutronCorePlugin
- OS::TripleO::Services::ComputeNeutronL3Agent
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Frr
- OS::TripleO::Services::IpaClient
- OS::TripleO::Services::Ipsec
- OS::TripleO::Services::Iscsid
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::LoginDefs
- OS::TripleO::Services::MetricsQdr
- OS::TripleO::Services::Multipathd
- OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::NeutronBgpVpnBagpipe
- OS::TripleO::Services::NeutronLinuxbridgeAgent
- OS::TripleO::Services::NeutronVppAgent
- OS::TripleO::Services::NovaAZConfig
- OS::TripleO::Services::NovaCompute
- OS::TripleO::Services::NovaLibvirt
- OS::TripleO::Services::NovaLibvirtGuests
- OS::TripleO::Services::NovaMigrationTarget
- OS::TripleO::Services::ContainersLogrotateCrond
- OS::TripleO::Services::Podman
- OS::TripleO::Services::Rear
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Rsyslog
- OS::TripleO::Services::RsyslogSidecar
- OS::TripleO::Services::Securetty
- OS::TripleO::Services::Snmp
- OS::TripleO::Services::Sshd
- OS::TripleO::Services::Timesync
- OS::TripleO::Services::Timezone
- OS::TripleO::Services::TripleoFirewall
- OS::TripleO::Services::TripleoPackages
- OS::TripleO::Services::Tuned
- OS::TripleO::Services::Vpp
- OS::TripleO::Services::OVNController
- OS::TripleO::Services::OVNMetadataAgent

60
ci/custom_names_network_data.yaml Normal file
View File

@ -0,0 +1,60 @@
- name: ExternalCloud1
name_lower: external_cloud_1
mtu: 1350
vip: true
dns_domain: externalcloud1.ooo.test.
service_net_map_replace: external
subnets:
external_cloud_1_subnet:
ip_subnet: 10.0.0.0/24
gateway_ip: 10.0.0.1
allocation_pools:
- start: 10.0.0.10
end: 10.0.0.50
- name: InternalApiCloud1
name_lower: internal_api_cloud_1
mtu: 1350
vip: true
dns_domain: internalapicloud1.ooo.test.
service_net_map_replace: internal_api
subnets:
internal_api_cloud_1_subnet:
ip_subnet: 172.17.0.0/24
allocation_pools:
- start: 172.17.0.10
end: 172.17.0.250
- name: StorageCloud1
name_lower: storage_cloud_1
mtu: 1350
vip: true
dns_domain: storagecloud1.ooo.test.
service_net_map_replace: storage
subnets:
storage_cloud_1_subnet:
ip_subnet: 172.18.0.0/24
allocation_pools:
- start: 172.18.0.10
end: 172.18.0.250
- name: StorageMgmtCloud1
name_lower: storage_mgmt_cloud_1
mtu: 1350
vip: true
dns_domain: storagemgmtcloud1.ooo.test.
service_net_map_replace: storage_mgmt
subnets:
storage_mgmt_cloud_1_subnet:
ip_subnet: 172.19.0.0/24
allocation_pools:
- start: 172.19.0.10
end: 172.19.0.250
- name: TenantCloud1
name_lower: tenant_cloud_1
mtu: 1350
dns_domain: tenantcloud1.ooo.test.
service_net_map_replace: tenant
subnets:
tenant_cloud_1_subnet:
ip_subnet: 172.16.0.0/24
allocation_pools:
- start: 172.16.0.10
end: 172.16.0.250

6
ci/custom_names_vip_data.yaml Normal file
View File

@ -0,0 +1,6 @@
- network: storage_mgmt_cloud_1
- network: internal_api_cloud_1
- network: storage_cloud_1
- ip_address: 10.0.0.5 # CI jobs rely on this fixed ip for the external VIP
network: external_cloud_1
- network: ctlplane

27
ci/environments/network/multiple-nics/custom-network-environment.yaml Normal file
View File

@ -0,0 +1,27 @@
parameter_merge_strategies:
ServiceNetMap: merge
parameter_defaults:
ControllerNetworkConfigTemplate: 'templates/ci/custom_network_multiple_nics.j2'
ComputeNetworkConfigTemplate: 'templates/ci/custom_network_multiple_nics.j2'
CloudNameExternalCloud1: overcloud1.ooo.test
CloudNameInternalApiCloud1: overcloud1.internalapicloud1.ooo.test
CloudNameStorageCloud1: overcloud1.storagecloud1.ooo.test
CloudNameStorageMgmtCloud1: overcloud1.storagemgmtcloud1.ooo.test
CloudNameCtlplane: overcloud1.ctlplane.ooo.test
CloudDomain: ooo.test
VipSubnetMap:
ctlplane: ctlplane-subnet
InternalApiCloud1: internal_api_cloud_1_subnet
StorageCloud1: storage_cloud_1_subnet
StorageMgmtCloud1: storage_mgmt_cloud_1_subnet
TenantCloud1: tenant_cloud_1_subnet
ExternalCloud1: external_cloud_1_subnet
redis: internal_api_cloud_1_subnet
ovn_dbs: internal_api_cloud_1_subnet
ServiceNetMap:
ComputeHostnameResolveNetwork: internal_api_cloud_1
ControllerHostnameResolveNetwork: internal_api_cloud_1
CephStorageHostnameResolveNetwork: storage_cloud_1
ControllerMetricsQdrNetwork: internal_api_cloud_1
ComputeMetricsQdrNetwork: internal_api_cloud_1
CephStorageMetricsQdrNetwork: storage_cloud_1