diff --git a/hooks/playbooks/control_plane_ceph_backends.yml b/hooks/playbooks/control_plane_ceph_backends.yml index ba3d383519..013c1f3222 100644 --- a/hooks/playbooks/control_plane_ceph_backends.yml +++ b/hooks/playbooks/control_plane_ceph_backends.yml @@ -21,110 +21,6 @@ state: directory - name: Create kustomization to add Ceph as backend - ansible.builtin.copy: + ansible.builtin.template: dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/90-ceph-backends-kustomization.yaml" - content: |- - apiVersion: kustomize.config.k8s.io/v1beta1 - kind: Kustomization - resources: - namespace: {{ cifmw_install_yamls_defaults['NAMESPACE'] }} - patches: - - target: - kind: OpenStackControlPlane - patch: |- - - op: add - path: /spec/extraMounts - value: - - name: v1 - region: r1 - extraVol: - - propagation: - - CinderVolume - - CinderBackup - - GlanceAPI - - ManilaShare - extraVolType: Ceph - volumes: - - name: ceph - projected: - sources: - - secret: - name: ceph-conf-files - mounts: - - name: ceph - mountPath: "/etc/ceph" - readOnly: true - - - op: replace - path: /spec/cinder/template/cinderBackup/replicas - value: {{ cifmw_services_cinder_bkp_replicas | default(1) }} - - - op: add - path: /spec/cinder/template/cinderBackup/customServiceConfig - value: | - [DEFAULT] - backup_driver = cinder.backup.drivers.ceph.CephBackupDriver - backup_ceph_pool = backups - backup_ceph_user = openstack - - - op: replace - path: /spec/cinder/template/cinderVolumes/volume1/replicas - value: {{ cifmw_services_cinder_vol_replicas | default(1) }} - - - op: add - path: /spec/cinder/template/cinderVolumes/volume1/customServiceConfig - value: | - [DEFAULT] - enabled_backends=ceph - [ceph] - volume_backend_name=ceph - volume_driver=cinder.volume.drivers.rbd.RBDDriver - rbd_ceph_conf=/etc/ceph/ceph.conf - rbd_user=openstack - rbd_pool=volumes - rbd_flatten_volume_from_snapshot=False - report_discard_supported=True - backend_host=hostgroup - rbd_secret_uuid={{ cifmw_ceph_fsid }} - - - op: replace - path: /spec/glance/template/glanceAPIs/default/replicas - value: {{ cifmw_services_glance_apis_replicas | default(1) }} - - - op: add - path: /spec/glance/template/customServiceConfig - value: | - [DEFAULT] - enabled_backends = default_backend:rbd - [glance_store] - default_backend = default_backend - [default_backend] - rbd_store_ceph_conf = /etc/ceph/ceph.conf - store_description = "RBD backend" - rbd_store_pool = images - rbd_store_user = openstack - - - op: replace - path: /spec/glance/template/glanceAPIs/default/type - value: split - - - op: add - path: /spec/manila/enabled - value: {{ cifmw_services_manila_enabled | default('false') }} - - - op: add - path: /spec/manila/template/customServiceConfig - value: | - [DEFAULT] - enabled_share_backends=cephfs - enabled_share_protocols=cephfs - debug=True - [cephfs] - driver_handles_share_servers=False - share_backend_name=cephfs - share_driver=manila.share.drivers.cephfs.driver.CephFSDriver - cephfs_conf_path=/etc/ceph/ceph.conf - cephfs_auth_id=openstack - cephfs_cluster_name=ceph - cephfs_volume_mode=0755 - cephfs_protocol_helper_type=CEPHFS + src: "config_ceph_backends.yaml.j2" diff --git a/hooks/playbooks/templates/config_ceph_backends.yaml.j2 b/hooks/playbooks/templates/config_ceph_backends.yaml.j2 new file mode 100644 index 0000000000..325d1c99d6 --- /dev/null +++ b/hooks/playbooks/templates/config_ceph_backends.yaml.j2 @@ -0,0 +1,104 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +namespace: {{ cifmw_install_yamls_defaults['NAMESPACE'] }} +patches: +- target: + kind: OpenStackControlPlane + patch: |- + - op: add + path: /spec/extraMounts + value: + - name: v1 + region: r1 + extraVol: + - propagation: + - CinderVolume + - CinderBackup + - GlanceAPI + - ManilaShare + extraVolType: Ceph + volumes: + - name: ceph + projected: + sources: + - secret: + name: ceph-conf-files + mounts: + - name: ceph + mountPath: "/etc/ceph" + readOnly: true + + - op: replace + path: /spec/cinder/template/cinderBackup/replicas + value: {{ cifmw_services_cinder_bkp_replicas | default(1) }} + + - op: add + path: /spec/cinder/template/cinderBackup/customServiceConfig + value: | + [DEFAULT] + backup_driver = cinder.backup.drivers.ceph.CephBackupDriver + backup_ceph_pool = backups + backup_ceph_user = openstack + + - op: replace + path: /spec/cinder/template/cinderVolumes/volume1/replicas + value: {{ cifmw_services_cinder_vol_replicas | default(1) }} + + - op: add + path: /spec/cinder/template/cinderVolumes/volume1/customServiceConfig + value: | + [DEFAULT] + enabled_backends=ceph + [ceph] + volume_backend_name=ceph + volume_driver=cinder.volume.drivers.rbd.RBDDriver + rbd_ceph_conf=/etc/ceph/ceph.conf + rbd_user=openstack + rbd_pool=volumes + rbd_flatten_volume_from_snapshot=False + report_discard_supported=True + backend_host=hostgroup + rbd_secret_uuid={{ cifmw_ceph_fsid }} + + - op: replace + path: /spec/glance/template/glanceAPIs/default/replicas + value: {{ cifmw_services_glance_apis_replicas | default(1) }} + + - op: add + path: /spec/glance/template/customServiceConfig + value: | + [DEFAULT] + enabled_backends = default_backend:rbd + [glance_store] + default_backend = default_backend + [default_backend] + rbd_store_ceph_conf = /etc/ceph/ceph.conf + store_description = "RBD backend" + rbd_store_pool = images + rbd_store_user = openstack + + - op: replace + path: /spec/glance/template/glanceAPIs/default/type + value: split + + - op: add + path: /spec/manila/enabled + value: {{ cifmw_services_manila_enabled | default('false') }} + + - op: add + path: /spec/manila/template/customServiceConfig + value: | + [DEFAULT] + enabled_share_backends=cephfs + enabled_share_protocols=cephfs + debug=True + [cephfs] + driver_handles_share_servers=False + share_backend_name=cephfs + share_driver=manila.share.drivers.cephfs.driver.CephFSDriver + cephfs_conf_path=/etc/ceph/ceph.conf + cephfs_auth_id=openstack + cephfs_cluster_name=ceph + cephfs_volume_mode=0755 + cephfs_protocol_helper_type=CEPHFS diff --git a/hooks/templates/service_config_ceph.yaml.j2 b/hooks/templates/service_config_ceph.yaml.j2 deleted file mode 100644 index 2c5385a551..0000000000 --- a/hooks/templates/service_config_ceph.yaml.j2 +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- ./{{ cifmw_kustomize_cr_file_name }} -namespace: {{ cifmw_install_yamls_defaults['NAMESPACE'] }} -patches: -- patch: |- - - op: replace - path: /spec/cinder/template/cinderVolumes/ceph/replicas - value: {{ cifmw_services_cinder_vol_replicas | default(1) }} - - op: add - path: /spec/cinder/template/cinderVolumes/ceph/customServiceConfig - value: | - [DEFAULT] - enabled_backends=ceph - debug=True - [ceph] - volume_backend_name=ceph - volume_driver=cinder.volume.drivers.rbd.RBDDriver - rbd_ceph_conf=/etc/ceph/ceph.conf - rbd_user=openstack - rbd_pool=volumes - rbd_flatten_volume_from_snapshot=False - report_discard_supported=True - backend_host=hostgroup - rbd_secret_uuid={{ cifmw_ceph_fsid }} - - op: add - path: /spec/cinder/template/cinderBackup/replicas - value: {{ cifmw_services_cinder_bkp_replicas | default(1) }} - - op: replace - path: /spec/manila/template/manilaShares/share1/replicas - value: {{ cifmw_services_manila_shr_replicas | default(1) }} - target: - kind: OpenStackControlPlane diff --git a/zuul.d/edpm_multinode.yaml b/zuul.d/edpm_multinode.yaml index ddc9ed49df..0e1dbddd60 100644 --- a/zuul.d/edpm_multinode.yaml +++ b/zuul.d/edpm_multinode.yaml @@ -278,6 +278,9 @@ cephfs_enabled: true ceph_nfs_enabled: true files: + - ^hooks/playbooks/control_plane_ceph_backends.yml + - ^hooks/playbooks/control_plane_hci_pre_deploy.yml + - ^hooks/playbooks/templates/config_ceph_backends.yaml.j2 - ^playbooks/06-deploy-edpm.yml - ^playbooks/ceph.yml - ^roles/edpm_deploy/(?!meta|README).* diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index 439103c9ab..2196caf2b8 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -59,6 +59,7 @@ - cifmw-molecule - podified-multinode-edpm-deployment-crc: *content_provider - cifmw-crc-podified-edpm-baremetal: *content_provider + - podified-multinode-hci-deployment-crc: *content_provider - project-template: name: data-plane-adoption-ci-framework-pipeline