Merge pull request #1057 from katarimanojk/unideltaipv6_external_Ceph

Call the external ceph deploy hooks for unideltaipv6

Author: openshift-merge-bot[bot]

scenarios/uni04delta-ipv6.yaml

@@ -63,13 +63,34 @@ stacks:
       - "/usr/share/openstack-tripleo-heat-templates/environments/services/ironic-inspector.yaml"
       - "/usr/share/openstack-tripleo-heat-templates/environments/services/barbican.yaml"
       - "/usr/share/openstack-tripleo-heat-templates/environments/barbican-backend-simple-crypto.yaml"
+      - "/usr/share/openstack-tripleo-heat-templates/environments/external-ceph.yaml"
+      - "/usr/share/openstack-tripleo-heat-templates/environments/manila-cephfsganesha-config.yaml"
+      - "/home/zuul/external_ceph_params.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
+    pre_oc_run:
+      - name: 01 Prepare Ceph nodes
+        type: playbook
+        source: "setup_cephnodes_ipv6.yaml"
+        inventory: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/data-plane-adoption'].
+                    src_dir }}/scenarios/uni04delta-ipv6/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/uni04delta-ipv6/ceph_inventory.yaml"
+      - name: 03 Create external Ceph parameters file
+        type: playbook
+        source: "create_external_ceph_params.yml"
+        extra_vars:
+          ceph_node: "osp-ext-ceph-uni04delta-ipv6-0"
+          ceph_mon_host: "2620:cf:cf:cccc::6a,2620:cf:cf:cccc::6b,2620:cf:cf:cccc::6c"
     post_oc_run:
       - name: Ironic post overcloud deploy
         type: playbook

scenarios/uni04delta-ipv6/ceph_inventory.yaml

@@ -0,0 +1,29 @@
+ceph:
+  hosts:
+    osp-ext-ceph-uni04delta-ipv6-0:
+      ansible_user: zuul
+      ansible_ssh_private_key_file: /home/zuul/.ssh/cifmw_reproducer_key
+      bridge_ip: 2620:cf:cf:aaaa::6a/64
+      external_ip: 2620:cf:cf:cf02::6a/64
+      internalapi_ip: 2620:cf:cf:bbbb::6a/64
+      storage_ip: 2620:cf:cf:cccc::6a/64
+      storagemgmt_ip: 2620:cf:cf:dddd::6a/64
+      tenant_ip: 2620:cf:cf:eeee::6a/64
+    osp-ext-ceph-uni04delta-ipv6-1:
+      ansible_user: zuul
+      ansible_ssh_private_key_file: /home/zuul/.ssh/cifmw_reproducer_key
+      bridge_ip: 2620:cf:cf:aaaa::6b/64
+      external_ip: 2620:cf:cf:cf02::6b/64
+      internalapi_ip: 2620:cf:cf:bbbb::6b/64
+      storage_ip: 2620:cf:cf:cccc::6b/64
+      storagemgmt_ip: 2620:cf:cf:dddd::6b/64
+      tenant_ip: 2620:cf:cf:eeee::6b/64
+    osp-ext-ceph-uni04delta-ipv6-2:
+      ansible_user: zuul
+      ansible_ssh_private_key_file: /home/zuul/.ssh/cifmw_reproducer_key
+      bridge_ip: 2620:cf:cf:aaaa::6c/64
+      external_ip: 2620:cf:cf:cf02::6c/64
+      internalapi_ip: 2620:cf:cf:bbbb::6c/64
+      storage_ip: 2620:cf:cf:cccc::6c/64
+      storagemgmt_ip: 2620:cf:cf:dddd::6c/64
+      tenant_ip: 2620:cf:cf:eeee::6c/64