[cifmw_cephadm] fix Swift by Ceph RGW on SNO setup

On SNO with a single EDPM compute (single-host CephHCI), the Ceph
ingress service (haproxy/keepalived) is not deployed because the
ceph_rgw.yml.j2 spec template only creates it for multi-host clusters.

Parameterize RGW port to correct the Keystone Swift endpoint for SNO.
Change the VIP detection logic so that if cifmw_cephadm_rgw_vip
is pre-set (e.g. to the host's storage IP for SNO cases) - it's
preserved. Otherwise it falls back to cifmw_cephadm_vip
(the ingress VIP) as before.

Users will be able to chose from
VIP:8080 vs host_ip:8082 accordingly.

Signed-off-by: Bohdan Dobrelia <bdobreli@redhat.com>

Author: bogdando

docs/dictionary/en-custom.txt

@@ -237,6 +237,7 @@ fips
 firewalld
 flbxutz
 fmw
+frontend
 fqdn
 freefonts
 frmo

roles/cifmw_cephadm/README.md

@@ -87,9 +87,18 @@ that they do not need to be changed for a typical EDPM deployment.
    `cifmw_cephadm_bootstrap_conf` file, which represents the initial Ceph
    configuration file passed at bootstrap time.
 
-* `cifmw_cephadm_rgw_vip`: the ingress daemon deployed along with `radosgw`
-   requires a `VIP` that will be owned by `keepalived`. This IP address will
-   be used as entry point to reach the `radosgw backends` through `haproxy`.
+* `cifmw_cephadm_rgw_vip`: an entry point to reach the
+   `radosgw` service. On multi-node deployments with ingress (haproxy +
+   keepalived) it holds the value for VIP owned by keepalived that
+   fronts the RGW backends via haproxy on port 8080. On SNO deployments where
+   ingress is not deployed, set this to the host's storage network IP so
+   the Swift endpoint points directly at the RGW daemon (port 8082).
+   If not set, it defaults to `cifmw_cephadm_vip` (the ingress VIP).
+
+* `cifmw_cephadm_rgw_port`: the port used in Swift/object-store Keystone
+   endpoints. Defaults to `8080` (the ingress/haproxy frontend port). For
+   single-node deployments without ingress, set to `8082` (the RGW daemon's
+   native `rgw_frontend_port`) so clients reach RGW directly.
 
 * `cifmw_cephadm_nfs_vip`: the ingress daemon deployed along with the `nfs`
    cluster requires a `VIP` that will be owned by `keepalived`. This IP

roles/cifmw_cephadm/defaults/main.yml

@@ -154,6 +154,7 @@ cifmw_cephadm_wait_install_retries: 8
 cifmw_cephadm_wait_install_delay: 15
 cifmw_cephadm_rgw_ingress_service_name: "ingress.rgw.default"
 cifmw_cephadm_rgw_ingress_service_id: "rgw.default"
+cifmw_cephadm_rgw_port: 8080
 # set ssl_backward compatibily to False if ceph version is equal or greater
 # than Tentacle
 cifmw_rgw_ssl_backward_compatibility: true

roles/cifmw_cephadm/tasks/configure_object.yml

@@ -126,16 +126,16 @@
             --url {{ cifmw_cephadm_urischeme }}://{{ (
               cifmw_external_dns_vip_ext.values() | first
               if cifmw_external_dns_vip_ext is defined
-              else cifmw_cephadm_rgw_vip | ansible.utils.ipaddr('address')
-            ) }}:8080/swift/v1/AUTH_%\(tenant_id\)s \
+              else _cephadm_rgw_vip | ansible.utils.ipaddr('address')
+            ) }}:{{ cifmw_cephadm_rgw_port }}/swift/v1/AUTH_%\(tenant_id\)s \
             {{ uuid_swift_public_ep.stdout }}
           oc -n {{ cifmw_cephadm_ns }} rsh openstackclient \
             openstack endpoint set \
             --url {{ cifmw_cephadm_urischeme }}://{{ (
               cifmw_external_dns_vip_int.values() | first
               if cifmw_external_dns_vip_int is defined
-              else cifmw_cephadm_rgw_vip | ansible.utils.ipaddr('address')
-            ) }}:8080/swift/v1/AUTH_%\(tenant_id\)s \
+              else _cephadm_rgw_vip | ansible.utils.ipaddr('address')
+            ) }}:{{ cifmw_cephadm_rgw_port }}/swift/v1/AUTH_%\(tenant_id\)s \
             {{ uuid_swift_internal_ep.stdout }}
 
 - name: Configure object store to use rgw
@@ -146,8 +146,8 @@
     script: |-
       oc -n {{ cifmw_cephadm_ns }} rsh openstackclient openstack role add --user {{ all_uuids.results.0.stdout }} --project {{ project_service_uuid.stdout }} {{ all_uuids.results.2.stdout }}
       oc -n {{ cifmw_cephadm_ns }} rsh openstackclient openstack role add --user {{ all_uuids.results.0.stdout }} --project {{ project_service_uuid.stdout }} {{ all_uuids.results.3.stdout }}
-      oc -n {{ cifmw_cephadm_ns }} rsh openstackclient openstack endpoint create --region regionOne {{ all_uuids.results.1.stdout }} public {{ cifmw_cephadm_urischeme }}://{{ cifmw_external_dns_vip_ext.values() | first if cifmw_external_dns_vip_ext is defined else cifmw_cephadm_rgw_vip | ansible.utils.ipaddr('address') }}:8080/swift/v1/AUTH_%\(tenant_id\)s
-      oc -n {{ cifmw_cephadm_ns }} rsh openstackclient openstack endpoint create --region regionOne {{ all_uuids.results.1.stdout }} internal {{ cifmw_cephadm_urischeme }}://{{ cifmw_external_dns_vip_int.values() | first if cifmw_external_dns_vip_int is defined else cifmw_cephadm_rgw_vip | ansible.utils.ipaddr('address') }}:8080/swift/v1/AUTH_%\(tenant_id\)s
+      oc -n {{ cifmw_cephadm_ns }} rsh openstackclient openstack endpoint create --region regionOne {{ all_uuids.results.1.stdout }} public {{ cifmw_cephadm_urischeme }}://{{ cifmw_external_dns_vip_ext.values() | first if cifmw_external_dns_vip_ext is defined else _cephadm_rgw_vip | ansible.utils.ipaddr('address') }}:{{ cifmw_cephadm_rgw_port }}/swift/v1/AUTH_%\(tenant_id\)s
+      oc -n {{ cifmw_cephadm_ns }} rsh openstackclient openstack endpoint create --region regionOne {{ all_uuids.results.1.stdout }} internal {{ cifmw_cephadm_urischeme }}://{{ cifmw_external_dns_vip_int.values() | first if cifmw_external_dns_vip_int is defined else _cephadm_rgw_vip | ansible.utils.ipaddr('address') }}:{{ cifmw_cephadm_rgw_port }}/swift/v1/AUTH_%\(tenant_id\)s
       oc -n {{ cifmw_cephadm_ns }} rsh openstackclient openstack role add --project {{ all_uuids.results.4.stdout }} --user {{ all_uuids.results.5.stdout }} {{ all_uuids.results.6.stdout }}
   delegate_to: localhost
   when:

roles/cifmw_cephadm/tasks/post.yml

@@ -52,7 +52,7 @@
     - cifmw_ceph_daemons_layout.rgw_enabled | default(true) | bool
   ansible.builtin.include_tasks: configure_object.yml
   vars:
-    cifmw_cephadm_rgw_vip: "{{ cifmw_cephadm_vip }}"
+    _cephadm_rgw_vip: "{{ cifmw_cephadm_rgw_vip | default(cifmw_cephadm_vip) }}"
 
 - name: Create RGW S3 openstack user
   when: