Merge pull request #1443 from rebtoor/OSPNW-1658

Enable Ceph for uni05epsilon adoption scenario

Author: openshift-merge-bot[bot]

scenarios/uni05epsilon.yaml

@@ -61,13 +61,33 @@ stacks:
       - "/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/external-ceph.yaml"
+      - "/home/zuul/external_ceph_params.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
+    pre_oc_run:
+      - name: 01 Prepare Ceph nodes
+        type: playbook
+        source: "setup_cephnodes.yaml"
+        inventory: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/data-plane-adoption'].
+                    src_dir }}/scenarios/uni05epsilon/ceph_inventory.yaml"
+      - name: 02 Deploy external ceph
+        type: playbook
+        source: "ceph.yml"
+        gathering: implicit
+        inventory: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/data-plane-adoption'].
+                    src_dir }}/scenarios/uni05epsilon/ceph_inventory.yaml"
+      - name: 03 Create external Ceph parameters file
+        type: playbook
+        source: "create_external_ceph_params.yml"
+        extra_vars:
+          ceph_node: "cell1-osp-compute-uni05epsilon-0"
+          ceph_mon_host: "172.18.0.94,172.18.0.95"
     post_oc_run:
       - name: Multi-cell post overcloud deploy
         type: playbook
@@ -93,6 +113,8 @@ stacks:
       - "/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/external-ceph.yaml"
+      - "/home/zuul/external_ceph_params.yaml"
       - "/home/zuul/cell1-input.yaml"
     network_data_file: "uni05epsilon/network_data.yaml.j2"
     routes: *sroutes
@@ -132,6 +154,8 @@ stacks:
       - "/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/external-ceph.yaml"
+      - "/home/zuul/external_ceph_params.yaml"
       - "/home/zuul/cell2-input.yaml"
     network_data_file: "uni05epsilon/network_data.yaml.j2"
     routes: *sroutes

scenarios/uni05epsilon/ceph_inventory.yaml

@@ -0,0 +1,20 @@
+computes:
+  hosts:
+    cell1-osp-compute-uni05epsilon-0:
+      ansible_user: zuul
+      ansible_ssh_private_key_file: /home/zuul/.ssh/cifmw_reproducer_key
+      bridge_ip: 192.168.122.94/24
+      external_ip: 172.21.0.94/24
+      internalapi_ip: 172.17.0.94/24
+      storage_ip: 172.18.0.94/24
+      storagemgmt_ip: 172.20.0.94/24
+      tenant_ip: 172.19.0.94/24
+    cell2-osp-compute-uni05epsilon-0:
+      ansible_user: zuul
+      ansible_ssh_private_key_file: /home/zuul/.ssh/cifmw_reproducer_key
+      bridge_ip: 192.168.122.95/24
+      external_ip: 172.21.0.95/24
+      internalapi_ip: 172.17.0.95/24
+      storage_ip: 172.18.0.95/24
+      storagemgmt_ip: 172.20.0.95/24
+      tenant_ip: 172.19.0.95/24

scenarios/uni05epsilon/config_download_cell1.yaml

@@ -43,6 +43,12 @@ resource_registry:
 
 parameter_defaults:
   SshFirewallAllowAll: true
+  ExtraFirewallRules:
+    '110 ceph_mon':
+      dport:
+        - 3300
+        - 6789
+      proto: tcp
 
   # Specify that this is an additional cell
   NovaAdditionalCell: true

scenarios/uni05epsilon/config_download_cell2.yaml

@@ -43,6 +43,12 @@ resource_registry:
 
 parameter_defaults:
   SshFirewallAllowAll: true
+  ExtraFirewallRules:
+    '110 ceph_mon':
+      dport:
+        - 3300
+        - 6789
+      proto: tcp
 
   # Specify that this is an additional cell
   NovaAdditionalCell: true

scenarios/uni05epsilon/osd_spec.yaml

@@ -0,0 +1,3 @@
+---
+data_devices:
+  all: true

scenarios/uni05epsilon/roles.yaml

@@ -46,6 +46,8 @@
     - OS::TripleO::Services::AuditD
     - OS::TripleO::Services::BootParams
     - OS::TripleO::Services::CACerts
+    - OS::TripleO::Services::CephClient
+    - OS::TripleO::Services::CephExternal
     - OS::TripleO::Services::CinderApi
     - OS::TripleO::Services::CinderBackendDellSc
     - OS::TripleO::Services::CinderBackendDellEMCPowerFlex
@@ -165,6 +167,8 @@
     - OS::TripleO::Services::AuditD
     - OS::TripleO::Services::BootParams
     - OS::TripleO::Services::CACerts
+    - OS::TripleO::Services::CephClient
+    - OS::TripleO::Services::CephExternal
     - OS::TripleO::Services::Clustercheck
     - OS::TripleO::Services::Collectd
     - OS::TripleO::Services::ContainerImagePrepare
@@ -217,6 +221,8 @@
       subnet: tenant_subnet
     Storage:
       subnet: storage_subnet
+    StorageMgmt:
+      subnet: storage_mgmt_subnet
   default_route_networks: ['ControlPlane']
   HostnameFormatDefault: '%stackname%-novacompute-%index%'
   RoleParametersDefault:
@@ -240,6 +246,8 @@
     - OS::TripleO::Services::AuditD
     - OS::TripleO::Services::BootParams
     - OS::TripleO::Services::CACerts
+    - OS::TripleO::Services::CephClient
+    - OS::TripleO::Services::CephExternal
     - OS::TripleO::Services::ComputeNeutronCorePlugin
     - OS::TripleO::Services::ComputeNeutronL3Agent
     - OS::TripleO::Services::ComputeNeutronMetadataAgent