Merge branch 'master' into fix-fqdn-maintenance

Author: jackhodgkiss

.github/workflows/bump-changelogs.yml

@@ -0,0 +1,10 @@
+name: Update changelogs on galaxy version bump
+on:
+  push:
+    paths:
+      - galaxy.yml
+    branches:
+      - antsibull_changelogs # change before merge
+jobs:
+  bump-changelogs:
+    uses: stackhpc/.github/.github/workflows/antsibull-release.yml@update_changelogs # todo: change to main once merged

.github/workflows/test.yml

@@ -72,7 +72,7 @@ jobs:
           report_paths: '**/tests/output/*/*.xml'
 
       - name: Upload HTML report 
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-html
           path: ansible_collections/stackhpc/cephadm/tests/output/reports/coverage/

CHANGELOG.rst

@@ -4,6 +4,14 @@ stackhpc.cephadm Release Notes
 
 .. contents:: Topics
 
+v1.19.1
+=======
+
+Bugfixes
+--------
+
+- pools - cephadm_pool tasks now correctly run with sudo
+
 v1.16.0
 =======
 
@@ -15,15 +23,12 @@ longer generates keyring files on Ceph hosts, and additional tasks
 are required to write keyring files to disk - see the cephadm_keys
 README.md for further details.
 
-
 Minor Changes
 -------------
 
-- Deprecate `generate_keys` functionality in cephadm_keys plugin
 - Deprecate `fetch_inital_keys` functionality in cephadm_keys plugin
-- Fix issue with idempotency in cephadm_keys plugin, by no longer
-  generating user keyring files on Ceph hosts.
-
+- Deprecate `generate_keys` functionality in cephadm_keys plugin
+- Fix issue with idempotency in cephadm_keys plugin, by no longer generating user keyring files on Ceph hosts.
 
 v1.13.0
 =======
@@ -33,7 +38,6 @@ Release Summary
 
 Minor release adding support for choosing plugin in EC profiles
 
-
 Minor Changes
 -------------
 

changelogs/changelog.yaml

@@ -1,9 +1,35 @@
 ancestor: null
 releases:
   1.13.0:
+    changes:
+      minor_changes:
+      - Add support for choosing plugin in EC profiles
+      release_summary: 'Minor release adding support for choosing plugin in EC profiles
+
+        '
     release_date: '2023-02-28'
+  1.16.0:
     changes:
-      release_summary: |
-        Minor release adding support for choosing plugin in EC profiles
       minor_changes:
-        - Add support for choosing plugin in EC profiles
+      - Deprecate `fetch_inital_keys` functionality in cephadm_keys plugin
+      - Deprecate `generate_keys` functionality in cephadm_keys plugin
+      - Fix issue with idempotency in cephadm_keys plugin, by no longer generating
+        user keyring files on Ceph hosts.
+      release_summary: 'Fix idempotency issue in cephadm_keys plugin. `cephadm_keys`
+        no
+
+        longer generates keyring files on Ceph hosts, and additional tasks
+
+        are required to write keyring files to disk - see the cephadm_keys
+
+        README.md for further details.
+
+        '
+    release_date: '2024-07-28'
+  1.19.1:
+    changes:
+      bugfixes:
+      - pools - cephadm_pool tasks now correctly run with sudo
+    fragments:
+    - sudo-fix.yml
+    release_date: '2025-01-08'

changelogs/fragments/.gitkeep

@@ -1,6 +1,6 @@
 namespace: "stackhpc"
 name: "cephadm"
-version: "1.18.0"
+version: "1.19.3"
 readme: "README.md"
 authors:
   - "Michal Nasiadka"

galaxy.yml

@@ -77,6 +77,11 @@
             - Restrict placement to devices of a specific class (hdd/ssd)
         required: false
         type: str
+    crush_failure_domain:
+        description:
+            - Set the failure domain for the CRUSH rule (e.g., 'rack', 'host', 'osd')
+        required: false
+        type: str
 
 author:
     - Guillaume Abrioux <[email protected]>
@@ -94,6 +99,13 @@
   cephadm_ec_profile:
     name: foo
     state: absent
+
+- name: create an erasure code profile with custom failure domain
+  cephadm_ec_profile:
+    name: foo-osd
+    k: 4
+    m: 2
+    crush_failure_domain: osd
 '''
 
 from ansible.module_utils.basic import AnsibleModule
@@ -120,7 +132,7 @@ def get_profile(module, name):
     return cmd
 
 
-def create_profile(module, name, k, m, stripe_unit, crush_device_class, directory, plugin, force=False):  # noqa: E501
+def create_profile(module, name, k, m, stripe_unit, crush_device_class, crush_failure_domain, directory, plugin, force=False):  # noqa: E501
     '''
     Create a profile
     '''
@@ -130,6 +142,8 @@ def create_profile(module, name, k, m, stripe_unit, crush_device_class, director
         args.append('stripe_unit={0}'.format(stripe_unit))
     if crush_device_class:
         args.append('crush-device-class={0}'.format(crush_device_class))
+    if crush_failure_domain:
+        args.append('crush-failure-domain={0}'.format(crush_failure_domain))
     if directory:
         args.append('directory={0}'.format(plugin))
     if plugin:
@@ -165,6 +179,7 @@ def run_module():
         k=dict(type='str', required=False),
         m=dict(type='str', required=False),
         crush_device_class=dict(type='str', required=False),
+        crush_failure_domain=dict(type='str', required=False),
         directory=dict(type='str', required=False),
         plugin=dict(type='str', required=False),
     )
@@ -182,6 +197,7 @@ def run_module():
     k = module.params.get('k')
     m = module.params.get('m')
     crush_device_class = module.params.get('crush_device_class')
+    crush_failure_domain = module.params.get('crush_failure_domain')
     directory = module.params.get('directory')
     plugin = module.params.get('plugin')
 
@@ -209,6 +225,7 @@ def run_module():
                current_profile['m'] != m or \
                current_profile.get('stripe_unit', stripe_unit) != stripe_unit or \
                current_profile.get('crush-device-class', crush_device_class) != crush_device_class or \
+               current_profile.get('crush-failure-domain', crush_failure_domain) != crush_failure_domain or \
                current_profile.get('directory', directory) != directory or \
                current_profile.get('plugin', plugin) != plugin:  # noqa: E501
                 rc, cmd, out, err = exec_command(module,
@@ -218,6 +235,7 @@ def run_module():
                                                                 m,
                                                                 stripe_unit,
                                                                 crush_device_class,  # noqa: E501
+                                                                crush_failure_domain,
                                                                 directory,
                                                                 plugin,
                                                                 force=True))  # noqa: E501
@@ -230,6 +248,7 @@ def run_module():
                                                                     m,
                                                                     stripe_unit,  # noqa: E501
                                                                     crush_device_class,  # noqa: E501
+                                                                    crush_failure_domain,
                                                                     directory,
                                                                     plugin))
             if rc == 0:

plugins/modules/cephadm_ec_profile.py

@@ -69,31 +69,31 @@
 
 EXAMPLES = '''
 - name: create cephx key
-  ceph_key:
+  cephadm_key:
     name: "{{ item.name }}"
     state: present
     caps: "{{ item.caps }}"
   with_items: "{{ keys_to_create }}"
 
 - name: delete cephx key
-  ceph_key:
+  cephadm_key:
     name: "my_key"
     state: absent
 
 - name: info cephx key
-  ceph_key:
+  cephadm_key:
     name: "my_key"
     state: info
 
 - name: info cephx admin key (plain)
-  ceph_key:
+  cephadm_key:
     name: client.admin
     output_format: plain
     state: info
   register: client_admin_key
 
 - name: list cephx keys
-  ceph_key:
+  cephadm_key:
     state: list
 '''
 
@@ -320,17 +320,17 @@ def run_module():
             else:
                 rc, cmd, out, err = exec_commands(module, update_key(name, caps))  # noqa: E501
                 if rc != 0:
-                    result["stdout"] = "Couldn't update caps for {0}".format(name)
+                    result["msg"] = "Couldn't update caps for {0}".format(name)
                     result["stderr"] = err
-                    module.exit_json(**result)
+                    module.fail_json(**result)
                 changed = True
 
         else:
             rc, cmd, out, err = exec_commands(module, create_key(name, caps))  # noqa: E501
             if rc != 0:
-                result["stdout"] = "Couldn't create {0}".format(name)
+                result["msg"] = "Couldn't create {0}".format(name)
                 result["stderr"] = err
-                module.exit_json(**result)
+                module.fail_json(**result)
             changed = True
 
     elif state == "absent":

plugins/modules/cephadm_key.py

@@ -6,7 +6,11 @@ cephadm_fsid: ""
 # Recreate cluster
 cephadm_recreate: false
 # Packages
-cephadm_custom_repos: false
+# NOTE(seunghun1ee): Set cephadm_custom_repos to true by default when host OS
+# is Ubuntu Noble.
+# This is because Ceph images for Noble are coming from Ubuntu repository
+# https://packages.ubuntu.com/noble-updates/cephadm
+cephadm_custom_repos: "{{ ansible_facts.distribution_release == 'noble' }}"
 cephadm_package_update: false
 # Images
 cephadm_image: ""

roles/cephadm/defaults/main.yml

@@ -20,3 +20,6 @@
     # NOTE: Without this, the delegate hosts's ansible_host variable will not
     # be respected.
     ansible_host: "{{ mon_ansible_host if 'mons' in group_names else hostvars[groups['mons'][0]].ansible_host }}"
+  until: osd_add_result.rc == 0
+  retries: 3
+  delay: 10