Skip to content

Commit

Permalink
Introduce uni01alpha scenario for 17.1 adoption
Browse files Browse the repository at this point in the history
Adds a new scenario for 17.1 adotpion of the uni01alpha deployment
topology.
  • Loading branch information
hjensas committed Nov 11, 2024
1 parent ff4b653 commit 915a21b
Show file tree
Hide file tree
Showing 7 changed files with 539 additions and 0 deletions.
65 changes: 65 additions & 0 deletions scenarios/uni01alpha.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
---
undercloud:
config:
- section: DEFAULT
option: undercloud_hostname
value: undercloud.localdomain
- section: DEFAULT
option: undercloud_timezone
value: UTC
- section: DEFAULT
option: undercloud_debug
value: true
- section: DEFAULT
option: container_cli
value: podman
- section: DEFAULT
option: undercloud_enable_selinux
value: false
- section: DEFAULT
option: generate_service_certificate
value: false
undercloud_parameters_override: "uni01alpha/hieradata_overrides_undercloud.yaml"
undercloud_parameters_defaults: "uni01alpha/undercloud_parameter_defaults.yaml"
ctlplane_vip: 192.168.122.99
cloud_domain: "localdomain"
hostname_groups_map:
# map ansible groups in the inventory to role hostname format for
# 17.1 deployment
osp-computes: "overcloud-compute"
osp-controllers: "overcloud-controller"
osp-networkers: "overcloud-networker"
roles_groups_map:
# map ansible groups to tripleo Role names
osp-computes: "Compute"
osp-controllers: "Controller"
osp-networkers: "Networker"
stacks:
- stackname: "overcloud"
args:
- "--override-ansible-cfg /home/zuul/ansible_config.cfg"
- "--templates /usr/share/openstack-tripleo-heat-templates"
- "--libvirt-type qemu"
- "--timeout 90"
- "--overcloud-ssh-user zuul"
- "--deployed-server"
- "--validation-warnings-fatal"
- "--disable-validations"
- "--heat-type pod"
- "--disable-protected-resource-types"
vars:
- "/usr/share/openstack-tripleo-heat-templates/environments/docker-ha.yaml"
- "/usr/share/openstack-tripleo-heat-templates/environments/podman.yaml"
- "/usr/share/openstack-tripleo-heat-templates/environments/low-memory-usage.yaml"
- "/usr/share/openstack-tripleo-heat-templates/environments/debug.yaml"
- "/usr/share/openstack-tripleo-heat-templates/environments/enable-legacy-telemetry.yaml"
- "/usr/share/openstack-tripleo-heat-templates/environments/services/ironic-overcloud.yaml"
- "/usr/share/openstack-tripleo-heat-templates/environments/services/ironic-inspector.yaml"
network_data_file: "uni01alpha/network_data.yaml.j2"
vips_data_file: "uni01alpha/vips_data.yaml"
roles_file: "uni01alpha/roles.yaml"
config_download_file: "uni01alpha/config_download.yaml"
stack_nodes:
- osp-computes
- osp-controllers
- osp-networkers
83 changes: 83 additions & 0 deletions scenarios/uni01alpha/config_download.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
---
resource_registry:
# yamllint disable rule:line-length
OS::TripleO::DeployedServer::ControlPlanePort: /usr/share/openstack-tripleo-heat-templates/deployed-server/deployed-neutron-port.yaml
OS::TripleO::OVNMacAddressNetwork: OS::Heat::None
OS::TripleO::OVNMacAddressPort: OS::Heat::None
OS::TripleO::Compute::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_internal_api.yaml
OS::TripleO::Compute::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_storage.yaml
OS::TripleO::Compute::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_storage_mgmt.yaml
OS::TripleO::Compute::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_tenant.yaml
OS::TripleO::Controller::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_internal_api.yaml
OS::TripleO::Controller::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_storage_mgmt.yaml
OS::TripleO::Controller::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_storage.yaml
OS::TripleO::Controller::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_tenant.yaml
OS::TripleO::Networker::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_internal_api.yaml
OS::TripleO::Networker::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_storage.yaml
OS::TripleO::Services::CeilometerAgentCentral: /usr/share/openstack-tripleo-heat-templates/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
OS::TripleO::Services::CeilometerAgentNotification: /usr/share/openstack-tripleo-heat-templates/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
OS::TripleO::Services::CeilometerAgentIpmi: /usr/share/openstack-tripleo-heat-templates/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
OS::TripleO::Services::ComputeCeilometerAgent: /usr/share/openstack-tripleo-heat-templates/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
OS::TripleO::Services::Collectd: /usr/share/openstack-tripleo-heat-templates/deployment/metrics/collectd-container-puppet.yaml
OS::TripleO::Services::MetricsQdr: /usr/share/openstack-tripleo-heat-templates/deployment/metrics/qdr-container-puppet.yaml
OS::TripleO::Services::OsloMessagingRpc: /usr/share/openstack-tripleo-heat-templates/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
OS::TripleO::Services::OsloMessagingNotify: /usr/share/openstack-tripleo-heat-templates/deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
OS::TripleO::Services::HAproxy: /usr/share/openstack-tripleo-heat-templates/deployment/haproxy/haproxy-pacemaker-puppet.yaml
OS::TripleO::Services::Pacemaker: /usr/share/openstack-tripleo-heat-templates/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
OS::TripleO::Services::PacemakerRemote: /usr/share/openstack-tripleo-heat-templates/deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
OS::TripleO::Services::Clustercheck: /usr/share/openstack-tripleo-heat-templates/deployment/pacemaker/clustercheck-container-puppet.yaml
OS::TripleO::Services::Redis: /usr/share/openstack-tripleo-heat-templates/deployment/database/redis-pacemaker-puppet.yaml
OS::TripleO::Services::Rsyslog: /usr/share/openstack-tripleo-heat-templates/deployment/logging/rsyslog-container-puppet.yaml
OS::TripleO::Services::MySQL: /usr/share/openstack-tripleo-heat-templates/deployment/database/mysql-pacemaker-puppet.yaml
OS::TripleO::Services::CinderBackup: /usr/share/openstack-tripleo-heat-templates/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
OS::TripleO::Services::CinderVolume: /usr/share/openstack-tripleo-heat-templates/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
OS::TripleO::Services::HeatApi: /usr/share/openstack-tripleo-heat-templates/deployment/heat/heat-api-container-puppet.yaml
OS::TripleO::Services::HeatApiCfn: /usr/share/openstack-tripleo-heat-templates/deployment/heat/heat-api-cfn-container-puppet.yaml
OS::TripleO::Services::HeatApiCloudwatch: /usr/share/openstack-tripleo-heat-templates/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
OS::TripleO::Services::HeatEngine: /usr/share/openstack-tripleo-heat-templates/deployment/heat/heat-engine-container-puppet.yaml
parameter_defaults:
RedisVirtualFixedIPs:
- ip_address: 192.168.122.130
use_neutron: false
OVNDBsVirtualFixedIPs:
- ip_address: 192.168.122.131
use_neutron: false
ControllerExtraConfig:
nova::compute::libvirt::services::libvirt_virt_type: qemu
nova::compute::libvirt::virt_type: qemu
ComputeExtraConfig:
nova::compute::libvirt::services::libvirt_virt_type: qemu
nova::compute::libvirt::virt_type: qemu
Debug: true
DockerPuppetDebug: true
ContainerCli: podman
ControllerCount: 3
ComputeCount: 2
NetworkerCount: 3
NeutronGlobalPhysnetMtu: 1350
CinderLVMLoopDeviceSize: 20480
CloudName: overcloud.localdomain
CloudNameInternal: overcloud.internalapi.localdomain
CloudNameStorage: overcloud.storage.localdomain
CloudNameStorageManagement: overcloud.storagemgmt.localdomain
CloudNameCtlplane: overcloud.ctlplane.localdomain
CloudDomain: localdomain
NetworkConfigWithAnsible: false
ControllerHostnameFormat: '%stackname%-controller-%index%'
ComputeHostnameFormat: '%stackname%-compute-%index%'
NetworkerHostnameFormat: '%stackname%-networker-%index%'
CtlplaneNetworkAttributes:
network:
dns_domain: localdomain
mtu: 1500
name: ctlplane
tags:
- 192.168.122.0/24
subnets:
ctlplane-subnet:
cidr: 192.168.122.0/24
dns_nameservers: 192.168.122.10
gateway_ip: 192.168.122.10
host_routes: []
name: ctlplane-subnet
ip_version: 4
3 changes: 3 additions & 0 deletions scenarios/uni01alpha/hieradata_overrides_undercloud.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
parameter_defaults:
UndercloudExtraConfig: {}
60 changes: 60 additions & 0 deletions scenarios/uni01alpha/network_data.yaml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
---
- name: Storage
mtu: 1500
vip: true
name_lower: storage
dns_domain: storage.{{ cloud_domain }}.
service_net_map_replace: storage
subnets:
storage_subnet:
vlan: 21
ip_subnet: '172.18.0.0/24'
allocation_pools: [{'start': '172.18.0.120', 'end': '172.18.0.250'}]

- name: StorageMgmt
mtu: 1500
vip: true
name_lower: storage_mgmt
dns_domain: storagemgmt.{{ cloud_domain }}.
service_net_map_replace: storage_mgmt
subnets:
storage_mgmt_subnet:
vlan: 23
ip_subnet: '172.20.0.0/24'
allocation_pools: [{'start': '172.20.0.120', 'end': '172.20.0.250'}]

- name: InternalApi
mtu: 1500
vip: true
name_lower: internal_api
dns_domain: internal-api.{{ cloud_domain }}.
service_net_map_replace: internal_api
subnets:
internal_api_subnet:
vlan: 20
ip_subnet: '172.17.0.0/24'
allocation_pools: [{'start': '172.17.0.120', 'end': '172.17.0.250'}]

- name: Tenant
mtu: 1500
vip: false # Tenant network does not use VIPs
name_lower: tenant
dns_domain: tenant.{{ cloud_domain }}.
service_net_map_replace: tenant
subnets:
tenant_subnet:
vlan: 22
ip_subnet: '172.19.0.0/24'
allocation_pools: [{'start': '172.19.0.120', 'end': '172.19.0.250'}]

- name: Ironic
mtu: 1500
name_lower: Ironic
dns_domain: ironic.{{ cloud_domain }}.
subnets:
ironic_subnet:
ip_subnet: 172.20.0.0/24
allocation_pools:
- start: 172.20.0.200
end: 172.20.0.250

Loading

0 comments on commit 915a21b

Please sign in to comment.