Merge pull request #994 from bogdando/uni05epsilon

Add uni05epsilon for multi-cell adoption

Author: openshift-merge-bot[bot]

scenarios/README.md

@@ -89,6 +89,47 @@ like:
 hostname_groups_map:
   osp-computes: "overcloud-novacompute"
   osp-controllers: "overcloud-controller"
+stacks:
+  - stackname: "overcloud"
+    stack_nodes:
+      - osp-computes
+      - osp-controllers
+```
+
+An example additional stack containing special mappings for cell controllers roles and HCI compute roles as cell computes hosts may look like:
+```
+roles_groups_map:
+  osp-computes: Compute
+  osp-controllers: Controller
+  cell1-osp-computes: ComputeHCI
+  cell1-osp-controllers: CellController
+hostname_groups_map:
+  osp-computes: overcloud-novacompute
+  osp-controllers: overcloud-controller
+  cell1-osp-computes: cell1-novacompute
+  cell1-osp-controllers: cell1-controller
+stacks:
+  - stackname: overcloud
+    stack_nodes:
+      - osp-computes
+      - osp-controllers
+  - stackname: cell1
+    stack_nodes:
+      - cell1-osp-computes
+      - cell1-osp-controllers
+```
+Additionally, the names of nodes defined in the `cifmw_networking_definition.instances`
+must be prefixed with the stack names (omitting it for the 'overcloud' stack name), and
+consequtively numbered end-to-end, for example:
+```
+cifmw_networking_definition:
+  instances:
+    controller-0:
+    cell1-controller-1:
+    cell2-controller-2:
+    cell1-compute-0:
+    cell2-compute-1:
+    cell1-compute-2:
 ```
 
 ### Roles groups map

scenarios/uni05epsilon.yaml

@@ -0,0 +1,157 @@
+---
+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
+  undercloud_parameters_override: "uni05epsilon/hieradata_overrides_undercloud.yaml"
+  undercloud_parameters_defaults: "uni05epsilon/undercloud_parameter_defaults.yaml"
+  ctlplane_vip: 192.168.122.101
+  routes: &sroutes
+    - ip_netmask: 0.0.0.0/0
+      next_hop: 192.168.122.1
+      default: true
+cloud_domain: example.com
+hostname_groups_map:
+  # map ansible groups in the inventory to role hostname format for
+  # 17.1 deployment
+  osp-controllers: overcloud-controller
+  cell1-osp-computes: cell1-novacompute
+  cell1-osp-controllers: cell1-controller
+  cell2-osp-computes: cell2-novacompute
+  cell2-osp-controllers: cell2-controller
+roles_groups_map:
+  # map ansible groups to tripleo Role names
+  osp-controllers: Controller
+  cell1-osp-controllers: CellController
+  cell2-osp-controllers: CellController
+# A new name for 'default' cell of OSP after adopting it into RHOSO
+default_cell_name: cell1
+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"
+    network_data_file: "uni05epsilon/network_data.yaml.j2"
+    routes: *sroutes
+    vips_data_file: "uni05epsilon/vips_data_overcloud.yaml"
+    roles_file: "uni05epsilon/roles.yaml"
+    config_download_file: "uni05epsilon/config_download_overcloud.yaml"
+    stack_nodes:
+      - osp-controllers
+    post_oc_run:
+      - name: Multi-cell post overcloud deploy
+        type: playbook
+        source: adoption_multicell_post_stack.yml
+        extra_vars:
+          stack: overcloud
+
+  - stackname: cell1
+    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"
+      - "/home/zuul/cell1-input.yaml"
+    network_data_file: "uni05epsilon/network_data.yaml.j2"
+    routes: *sroutes
+    vips_data_file: "uni05epsilon/vips_data_cell1.yaml"
+    roles_file: "uni05epsilon/roles.yaml"
+    config_download_file: "uni05epsilon/config_download_cell1.yaml"
+    stack_nodes:
+      - cell1-osp-computes
+      - cell1-osp-controllers
+    pre_oc_run:
+      - name: Multi-cell pre overcloud deploy
+        type: playbook
+        source: adoption_multicell_pre_stack.yml
+        extra_vars:
+          stack: cell1
+    post_oc_run:
+      - name: Multi-cell post overcloud deploy
+        type: playbook
+        source: adoption_multicell_post_stack.yml
+        extra_vars:
+          stack: cell1
+
+  - stackname: cell2
+    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"
+      - "/home/zuul/cell2-input.yaml"
+    network_data_file: "uni05epsilon/network_data.yaml.j2"
+    routes: *sroutes
+    vips_data_file: "uni05epsilon/vips_data_cell2.yaml"
+    roles_file: "uni05epsilon/roles.yaml"
+    config_download_file: "uni05epsilon/config_download_cell2.yaml"
+    stack_nodes:
+      - cell2-osp-computes
+      - cell2-osp-controllers
+    pre_oc_run:
+      - name: Multi-stack pre stack deploy
+        type: playbook
+        source: adoption_multicell_pre_stack.yml
+        extra_vars:
+          stack: cell2
+    post_oc_run:
+      - name: Multi-cell post stack deploy manage cells
+        type: playbook
+        source: adoption_multicell_post_stack.yml
+        extra_vars:
+          stack: cell2
+      - name: Multi-stack post all stacks deploy manage /etc/hosts
+        type: playbook
+        source: adoption_multicell_post_stack_all.yml

scenarios/uni05epsilon/config_download_cell1.yaml

@@ -0,0 +1,121 @@
+---
+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::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_storage_mgmt.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::CellController::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_internal_api.yaml
+  OS::TripleO::CellController::Ports::StorageMgmtPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_storage_mgmt.yaml
+  OS::TripleO::CellController::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_storage.yaml
+  OS::TripleO::CellController::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_tenant.yaml
+  OS::TripleO::Compute::Ports::ExternalPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_external.yaml
+  OS::TripleO::CellController::Ports::ExternalPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_external.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
+
+  # Complements the 'ManageNetworks: false', not needed otherwise
+  OS::TripleO::Network::External: OS::Heat::None
+  OS::TripleO::Network::InternalApi: OS::Heat::None
+  OS::TripleO::Network::Storage: OS::Heat::None
+  OS::TripleO::Network::StorageMgmt: OS::Heat::None
+  OS::TripleO::Network::Tenant: OS::Heat::None
+  OS::TripleO::Network::Management: OS::Heat::None
+
+parameter_defaults:
+  SshFirewallAllowAll: true
+
+  # Specify that this is an additional cell
+  NovaAdditionalCell: true
+  # Disable network creation in order to use the `network_data.yaml` file from the overcloud stack,
+  # and create ports for the nodes in the separate stacks on the existing networks.
+  # NOTE(bogdando): might need to enable it, to deploy cells-specific subdomains from different network_data_cellX.yaml files.
+  # Also, test RHOSO adoption for a metadata agent deployed per each cell, to see if it handles each one properly,
+  # when transitioning all to a superconductor layoyt from a flat OSP17.1 layout
+  ManageNetworks: false
+  NovaLocalMetadataPerCell: true
+
+  RedisVirtualFixedIPs:
+    - ip_address: 192.168.122.111
+      use_neutron: false
+  OVNDBsVirtualFixedIPs:
+    - ip_address: 192.168.122.121
+      use_neutron: false
+  ComputeExtraConfig:
+    nova::compute::libvirt::services::libvirt_virt_type: qemu
+    nova::compute::libvirt::virt_type: qemu
+  Debug: true
+  DockerPuppetDebug: true
+  ContainerCli: podman
+
+  CellControllerCount: 1
+  ControllerCount: 0
+  ComputeCount: 1
+  NeutronGlobalPhysnetMtu: 1350
+  CinderLVMLoopDeviceSize: 20480
+
+  CloudName: overcloud.example.com
+  CloudNameInternal: overcloud.internalapi.example.com
+  CloudNameStorage: overcloud.storage.example.com
+  CloudNameStorageManagement: overcloud.storagemgmt.example.com
+  CloudNameExternal: overcloud.external.example.com
+  CloudNameCtlplane: overcloud.ctlplane.example.com
+  CloudDomain: example.com
+
+  OVNCMSOptions: enable-chassis-as-gw
+  NeutronPhysicalBridge: br-ex
+  NeutronNetworkType: geneve
+  NeutronTunnelTypes: geneve
+  NeutronBridgeMappings: datacentre:br-ex
+
+  CellControllerHostnameFormat: '%stackname%-controller-%index%'
+  ComputeHostnameFormat: '%stackname%-novacompute-%index%'
+
+  # If tripleo_networking, update the existing os-net-config on deployed servers for tripleo isolnet
+  # This should also work for CI, where we initially configure zuul subnodes with os-net-config,
+  # but is mostly targeting local libvirt or cloud deployments (without zuul and ci-framework)
+  NetworkConfigWithAnsible: false
+  ComputeNetworkConfigUpdate: false
+  BlockStorageNetworkConfigUpdate: false
+  ObjectStorageNetworkConfigUpdate: false
+  CellControllerNetworkConfigUpdate: false
+
+  ComputeNetworkConfigTemplate: templates/single_nic_vlans/single_nic_vlans.j2
+  BlockStorageNetworkConfigTemplate: templates/single_nic_vlans/single_nic_vlans.j2
+  ObjectStorageNetworkConfigTemplate: templates/single_nic_vlans/single_nic_vlans.j2
+  CellControllerNetworkConfigTemplate: templates/single_nic_vlans/single_nic_vlans.j2
+
+  CtlplaneNetworkAttributes:
+    network:
+      dns_domain: example.com
+      mtu: 1500
+      name: ctlplane
+      tags:
+        - 192.168.122.0/24
+    subnets:
+      ctlplane-subnet:
+        cidr: 192.168.122.0/24
+        dns_nameservers: 192.168.122.1
+        gateway_ip: 192.168.122.1
+        host_routes: []
+        name: ctlplane-subnet
+        ip_version: 4