Merge pull request #946 from fyanac/osp_unideltaipv6

Add unideltaipv6 scenario 17.1 for adoption

Author: openshift-merge-bot[bot]

scenarios/uni04delta-ipv6.yaml

@@ -0,0 +1,70 @@
+---
+undercloud:
+  config:
+    - section: DEFAULT
+      option: undercloud_hostname
+      value: undercloud.example.com
+    - 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
+    - section: DEFAULT
+      option: ipv6_address_mode
+      value: dhcpv6-stateful
+    - section: DEFAULT
+      option: enable_routed_networks
+      value: true
+
+  undercloud_parameters_override: "uni04delta-ipv6/hieradata_overrides_undercloud.yaml"
+  undercloud_parameters_defaults: "uni04delta-ipv6/undercloud_parameter_defaults.yaml"
+  ctlplane_vip: 2620:cf:cf:aaaa::98
+
+cloud_domain: "example.com"
+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"
+roles_groups_map:
+  # map ansible groups to tripleo Role names
+  osp-computes: "Compute"
+  osp-controllers: "Controller"
+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/barbican.yaml"
+      - "/usr/share/openstack-tripleo-heat-templates/environments/barbican-backend-simple-crypto.yaml"
+    network_data_file: "uni04delta-ipv6/network_data.yaml.j2"
+    vips_data_file: "uni04delta-ipv6/vips_data.yaml"
+    roles_file: "uni04delta-ipv6/roles.yaml"
+    config_download_file: "uni04delta-ipv6/config_download.yaml"
+    stack_nodes:
+      - osp-computes
+      - osp-controllers

scenarios/uni04delta-ipv6/config_download.yaml

@@ -0,0 +1,92 @@
+---
+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::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::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::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: 2620:cf:cf:aaaa::82
+      use_neutron: false
+  OVNDBsVirtualFixedIPs:
+    - ip_address: 2620:cf:cf:aaaa::83
+      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
+  ExtraConfig:
+    neutron::notification_driver: 'noop'
+  BarbicanSimpleCryptoGlobalDefault: true
+  Debug: true
+  DockerPuppetDebug: true
+  ContainerCli: podman
+  ControllerCount: 3
+  ComputeCount: 2
+  NeutronGlobalPhysnetMtu: 1500
+  CinderLVMLoopDeviceSize: 20480
+  CloudName: overcloud.example.com
+  CloudNameInternal: overcloud.internalapi.example.com
+  CloudNameStorage: overcloud.storage.example.com
+  CloudNameStorageManagement: overcloud.storagemgmt.example.com
+  CloudNameCtlplane: overcloud.ctlplane.example.com
+  CloudDomain: example.com
+  NetworkConfigWithAnsible: false
+  ControllerHostnameFormat: '%stackname%-controller-%index%'
+  ComputeHostnameFormat: '%stackname%-compute-%index%'
+  EnableVLANTransparency: true
+  NeutronServicePlugins: 'qos,ovn-router,trunk,segments,log'
+  NeutronEnableIgmpSnooping: true
+  OVNEmitNeedToFrag: false
+  NeutronNetworkVLANRanges: 'datacentre:1000:2000'
+  NeutronTypeDrivers: 'geneve,vlan,flat,local'
+  NeutronNetworkType: 'vlan,flat'
+  NeutronDnsDomain: 'example.com'
+  NeutronRouterSchedulerDriver: 'neutron.scheduler.l3_agent_scheduler.ChanceScheduler'
+  NeutronEnableDVR: true
+  CtlplaneNetworkAttributes:
+    network:
+      dns_domain: example.com
+      mtu: 1500
+      name: ctlplane
+      tags:
+        - 2620:cf:cf:aaaa::/64
+    subnets:
+      ctlplane-subnet:
+        cidr: 2620:cf:cf:aaaa::/64
+        dns_nameservers: 2620:cf:cf:aaaa::1
+        gateway_ip: 2620:cf:cf:aaaa::1
+        host_routes: []
+        name: ctlplane-subnet
+        ip_version: 6
+  NeutronBridgeMappings:
+    - datacentre:br-ex

scenarios/uni04delta-ipv6/hieradata_overrides_undercloud.yaml

@@ -0,0 +1,3 @@
+---
+parameter_defaults:
+  UndercloudExtraConfig: {}

scenarios/uni04delta-ipv6/network_data.yaml.j2

@@ -0,0 +1,74 @@
+---
+- name: Storage
+  mtu: 1500
+  vip: true
+  ipv6: true
+  name_lower: storage
+  dns_domain: storage.{{ cloud_domain }}.
+  service_net_map_replace: storage
+  subnets:
+    storage_subnet:
+      vlan: 21
+      ipv6_subnet: '2620:cf:cf:cccc::/64'
+      ipv6_allocation_pools: [{'start': '2620:cf:cf:cccc::100', 'end': '2620:cf:cf:cccc::250'}]
+
+- name: InternalApi
+  mtu: 1500
+  vip: true
+  ipv6: true
+  name_lower: internal_api
+  dns_domain: internal-api.{{ cloud_domain }}.
+  service_net_map_replace: internal_api
+  subnets:
+    internal_api_subnet:
+      vlan: 20
+      ipv6_subnet: '2620:cf:cf:bbbb::/64'
+      ipv6_allocation_pools: [{'start': '2620:cf:cf:bbbb::100', 'end': '2620:cf:cf:bbbb::250'}]
+
+- name: Tenant
+  mtu: 1500
+  vip: false  # Tenant network does not use VIPs
+  ipv6: true
+  name_lower: tenant
+  dns_domain: tenant.{{ cloud_domain }}.
+  service_net_map_replace: tenant
+  subnets:
+    tenant_subnet:
+      vlan: 22
+      ipv6_subnet: '2620:cf:cf:eeee::/64'
+      ipv6_allocation_pools: [{'start': '2620:cf:cf:eeee::100', 'end': '2620:cf:cf:eeee::250'}]
+
+- name: External
+  mtu: 1500
+  vip: true
+  ipv6: true
+  name_lower: external
+  dns_domain: external.{{ cloud_domain }}.
+  service_net_map_replace: external
+  subnets:
+    external_subnet:
+      ipv6_subnet: '2620:cf:cf:cf02::/64'
+      ipv6_allocation_pools: [{'start': '2620:cf:cf:cf02::130', 'end': '2620:cf:cf:cf02::250'}]
+
+- name: Ironic
+  mtu: 1500
+  vip: true
+  ipv6: true
+  name_lower: ironic
+  dns_domain: ironic.{{ cloud_domain }}.
+  subnets:
+    ironic_subnet:
+      ipv6_subnet: 2620:cf:cf:ffff::/64
+      ipv6_allocation_pools: [{'start': '2620:cf:cf:ffff::30', 'end': '2620:cf:cf:ffff::70'}]
+
+- name: StorageMgmt
+  mtu: 1500
+  vip: true
+  ipv6: true
+  name_lower: storagemgmt
+  dns_domain: storagemgmt.{{ cloud_domain }}.
+  subnets:
+    storage_mgmt_subnet:
+      vlan: 23
+      ipv6_subnet: "2620:cf:cf:dddd::/64"
+      ipv6_allocation_pools: [{'start': '2620:cf:cf:dddd::100', 'end': '2620:cf:cf:dddd::250'}]