Skip to content

Commit eefe467

Browse files
committed
Test data-plane adoption with a hybrid deployment
1 parent a05cdd1 commit eefe467

File tree

8 files changed

+516
-0
lines changed

8 files changed

+516
-0
lines changed

scenarios/sriov.yaml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
---
2+
undercloud:
3+
config:
4+
- section: DEFAULT
5+
option: undercloud_hostname
6+
value: undercloud.localdomain
7+
- section: DEFAULT
8+
option: undercloud_timezone
9+
value: UTC
10+
- section: DEFAULT
11+
option: undercloud_debug
12+
value: true
13+
- section: DEFAULT
14+
option: container_cli
15+
value: podman
16+
- section: DEFAULT
17+
option: undercloud_enable_selinux
18+
value: false
19+
- section: DEFAULT
20+
option: generate_service_certificate
21+
value: false
22+
undercloud_parameters_override: "sriov/hieradata_overrides_undercloud.yaml"
23+
undercloud_parameters_defaults: "sriov/undercloud_parameter_defaults.yaml"
24+
ctlplane_vip: 192.168.122.101
25+
cloud_domain: "localdomain"
26+
hostname_groups_map:
27+
# map ansible groups in the inventory to role hostname format for
28+
# 17.1 deployment
29+
osp-computes: "overcloud-compute"
30+
osp-controllers: "overcloud-controller"
31+
roles_groups_map:
32+
# map ansible groups to tripleo Role names
33+
osp-computes: "Compute"
34+
osp-controllers: "Controller"
35+
stacks:
36+
- stackname: "overcloud"
37+
args:
38+
- "--override-ansible-cfg /home/zuul/ansible_config.cfg"
39+
- "--templates /usr/share/openstack-tripleo-heat-templates"
40+
- "--libvirt-type qemu"
41+
- "--timeout 100"
42+
- "--overcloud-ssh-user zuul"
43+
- "--deployed-server"
44+
- "--validation-warnings-fatal"
45+
- "--disable-validations"
46+
- "--heat-type pod"
47+
- "--disable-protected-resource-types"
48+
vars:
49+
- "/usr/share/openstack-tripleo-heat-templates/environments/services/neutron-ovn-ha.yaml"
50+
- "/usr/share/openstack-tripleo-heat-templates/environments/services/neutron-ovn-sriov.yaml"
51+
- "/usr/share/openstack-tripleo-heat-templates/environments/docker-ha.yaml"
52+
- "/usr/share/openstack-tripleo-heat-templates/environments/podman.yaml"
53+
- "/usr/share/openstack-tripleo-heat-templates/environments/debug.yaml"
54+
- "/usr/share/openstack-tripleo-heat-templates/environments/enable-legacy-telemetry.yaml"
55+
network_data_file: "sriov/network_data.yaml.j2"
56+
vips_data_file: "sriov/vips_data.yaml"
57+
roles_file: "sriov/roles.yaml"
58+
config_download_file: "sriov/config_download.yaml"
59+
stack_nodes:
60+
- osp-computes
61+
- osp-controllers
62+
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
---
2+
resource_registry:
3+
# yamllint disable rule:line-length
4+
OS::TripleO::DeployedServer::ControlPlanePort: /usr/share/openstack-tripleo-heat-templates/deployed-server/deployed-neutron-port.yaml
5+
OS::TripleO::OVNMacAddressNetwork: OS::Heat::None
6+
OS::TripleO::OVNMacAddressPort: OS::Heat::None
7+
OS::TripleO::Compute::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_internal_api.yaml
8+
OS::TripleO::Compute::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_storage.yaml
9+
OS::TripleO::Compute::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_tenant.yaml
10+
OS::TripleO::Controller::Ports::ExternalPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_external.yaml
11+
OS::TripleO::Controller::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_internal_api.yaml
12+
OS::TripleO::Controller::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_storage.yaml
13+
OS::TripleO::Controller::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_tenant.yaml
14+
OS::TripleO::Services::CeilometerAgentCentral: /usr/share/openstack-tripleo-heat-templates/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
15+
OS::TripleO::Services::CeilometerAgentNotification: /usr/share/openstack-tripleo-heat-templates/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
16+
OS::TripleO::Services::CeilometerAgentIpmi: /usr/share/openstack-tripleo-heat-templates/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
17+
OS::TripleO::Services::ComputeCeilometerAgent: /usr/share/openstack-tripleo-heat-templates/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
18+
OS::TripleO::Services::Collectd: /usr/share/openstack-tripleo-heat-templates/deployment/metrics/collectd-container-puppet.yaml
19+
OS::TripleO::Services::MetricsQdr: /usr/share/openstack-tripleo-heat-templates/deployment/metrics/qdr-container-puppet.yaml
20+
OS::TripleO::Services::OsloMessagingRpc: /usr/share/openstack-tripleo-heat-templates/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
21+
OS::TripleO::Services::OsloMessagingNotify: /usr/share/openstack-tripleo-heat-templates/deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
22+
OS::TripleO::Services::HAproxy: /usr/share/openstack-tripleo-heat-templates/deployment/haproxy/haproxy-pacemaker-puppet.yaml
23+
OS::TripleO::Services::Pacemaker: /usr/share/openstack-tripleo-heat-templates/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
24+
OS::TripleO::Services::PacemakerRemote: /usr/share/openstack-tripleo-heat-templates/deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
25+
OS::TripleO::Services::Clustercheck: /usr/share/openstack-tripleo-heat-templates/deployment/pacemaker/clustercheck-container-puppet.yaml
26+
OS::TripleO::Services::Redis: /usr/share/openstack-tripleo-heat-templates/deployment/database/redis-pacemaker-puppet.yaml
27+
OS::TripleO::Services::Rsyslog: /usr/share/openstack-tripleo-heat-templates/deployment/logging/rsyslog-container-puppet.yaml
28+
OS::TripleO::Services::MySQL: /usr/share/openstack-tripleo-heat-templates/deployment/database/mysql-pacemaker-puppet.yaml
29+
OS::TripleO::Services::CinderBackup: /usr/share/openstack-tripleo-heat-templates/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
30+
OS::TripleO::Services::CinderVolume: /usr/share/openstack-tripleo-heat-templates/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
31+
OS::TripleO::Services::HeatApi: /usr/share/openstack-tripleo-heat-templates/deployment/heat/heat-api-container-puppet.yaml
32+
OS::TripleO::Services::HeatApiCfn: /usr/share/openstack-tripleo-heat-templates/deployment/heat/heat-api-cfn-container-puppet.yaml
33+
OS::TripleO::Services::HeatApiCloudwatch: /usr/share/openstack-tripleo-heat-templates/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
34+
OS::TripleO::Services::HeatEngine: /usr/share/openstack-tripleo-heat-templates/deployment/heat/heat-engine-container-puppet.yaml
35+
OS::TripleO::Controller::Net::SoftwareConfig: OS::Heat::None
36+
OS::TripleO::ComputeSriov::Net::SoftwareConfig: OS::Heat::None
37+
parameter_defaults:
38+
RedisVirtualFixedIPs:
39+
- ip_address: 192.168.122.110
40+
use_neutron: false
41+
OVNDBsVirtualFixedIPs:
42+
- ip_address: 192.168.122.111
43+
use_neutron: false
44+
ControllerExtraConfig:
45+
nova::compute::libvirt::services::libvirt_virt_type: qemu
46+
nova::compute::libvirt::virt_type: qemu
47+
ComputeExtraConfig:
48+
nova::compute::libvirt::services::libvirt_virt_type: qemu
49+
nova::compute::libvirt::virt_type: qemu
50+
Debug: true
51+
DockerPuppetDebug: true
52+
ContainerCli: podman
53+
ControllerCount: 3
54+
ComputeCount: 2
55+
NeutronGlobalPhysnetMtu: 1350
56+
CinderLVMLoopDeviceSize: 20480
57+
CloudName: overcloud.example.com
58+
CloudNameInternal: overcloud.internalapi.example.com
59+
CloudNameStorage: overcloud.storage.example.com
60+
CloudNameStorageManagement: overcloud.storagemgmt.example.com
61+
CloudNameCtlplane: overcloud.ctlplane.example.com
62+
CloudDomain: example.com
63+
NetworkConfigWithAnsible: false
64+
ControllerHostnameFormat: '%stackname%-controller-%index%'
65+
ComputeHostnameFormat: '%stackname%-compute-%index%'
66+
CtlplaneNetworkAttributes:
67+
network:
68+
dns_domain: ctlplane.localdomain.
69+
mtu: 1500
70+
name: ctlplane
71+
tags:
72+
- 192.168.122.0/24
73+
subnets:
74+
ctlplane-subnet:
75+
cidr: 192.168.122.0/24
76+
dns_nameservers:
77+
- 172.16.0.1
78+
- 10.0.0.1
79+
gateway_ip: 192.168.122.10
80+
host_routes: []
81+
ip_version: 4
82+
name: ctlplane-subnet
83+
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
parameter_defaults:
3+
UndercloudExtraConfig:
4+
ironic::disk_utils::image_convert_memory_limit: 2048
5+
ironic::conductor::heartbeat_interval: 20
6+
ironic::conductor::heartbeat_timeout: 120
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
- name: Storage
3+
mtu: 1500
4+
vip: true
5+
name_lower: storage
6+
dns_domain: storage.{{ cloud_domain }}.
7+
service_net_map_replace: storage
8+
subnets:
9+
storage_subnet:
10+
vlan: 14
11+
ip_subnet: '172.18.0.0/24'
12+
allocation_pools: [{'start': '172.18.0.120', 'end': '172.18.0.250'}]
13+
14+
- name: InternalApi
15+
mtu: 1500
16+
vip: true
17+
name_lower: internal_api
18+
dns_domain: internal-api.{{ cloud_domain }}.
19+
service_net_map_replace: internal_api
20+
subnets:
21+
internal_api_subnet:
22+
vlan: 11
23+
ip_subnet: '172.17.0.0/24'
24+
allocation_pools: [{'start': '172.17.0.120', 'end': '172.17.0.250'}]
25+
26+
- name: Tenant
27+
mtu: 1500
28+
vip: false # Tenant network does not use VIPs
29+
name_lower: tenant
30+
dns_domain: tenant.{{ cloud_domain }}.
31+
service_net_map_replace: tenant
32+
subnets:
33+
tenant_subnet:
34+
vlan: 13
35+
ip_subnet: '172.19.0.0/24'
36+
allocation_pools: [{'start': '172.19.0.120', 'end': '172.19.0.250'}]
37+
38+
- name: External
39+
mtu: 1500
40+
vip: true
41+
name_lower: external
42+
dns_domain: external.{{ cloud_domain }}.
43+
service_net_map_replace: external
44+
subnets:
45+
external_subnet:
46+
vlan: 12
47+
ip_subnet: '10.0.0.0/24'
48+
allocation_pools: [{'start': '10.0.0.150', 'end': '10.0.0.250'}]
49+
50+
- name: StorageMgmt
51+
name_lower: storage_mgmt
52+
mtu: 1500
53+
vip: true
54+
dns_domain: storage_mgmt.{{ cloud_domain }}.
55+
service_net_map_replace: storage_mgmt
56+
subnets:
57+
storage_mgmt_subnet:
58+
vlan: 15
59+
ip_subnet: '172.20.0.0/24'
60+
allocation_pools: [{'start': '172.20.0.150', 'end': '172.20.0.250'}]

scenarios/sriov/osd_spec.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
data_devices:
3+
all: true

0 commit comments

Comments
 (0)