diff --git a/group_vars/clients.yml.sample b/group_vars/clients.yml.sample index 41732efd8..834ece853 100644 --- a/group_vars/clients.yml.sample +++ b/group_vars/clients.yml.sample @@ -23,6 +23,7 @@ dummy: # pg_num: "{{ osd_pool_default_pg_num }}" # pgp_num: "{{ osd_pool_default_pg_num }}" # rule_name: "replicated_rule" +# application: "rbd" # type: 1 # erasure_profile: "" # expected_num_objects: "" @@ -32,6 +33,7 @@ dummy: # pg_num: "{{ osd_pool_default_pg_num }}" # pgp_num: "{{ osd_pool_default_pg_num }}" # rule_name: "replicated_rule" +# application: "rbd" # type: 1 # erasure_profile: "" # expected_num_objects: "" diff --git a/roles/ceph-client/defaults/main.yml b/roles/ceph-client/defaults/main.yml index 22a6de76b..b019bc6cc 100644 --- a/roles/ceph-client/defaults/main.yml +++ b/roles/ceph-client/defaults/main.yml @@ -15,6 +15,7 @@ test: pg_num: "{{ osd_pool_default_pg_num }}" pgp_num: "{{ osd_pool_default_pg_num }}" rule_name: "replicated_rule" + application: "rbd" type: 1 erasure_profile: "" expected_num_objects: "" @@ -24,6 +25,7 @@ test2: pg_num: "{{ osd_pool_default_pg_num }}" pgp_num: "{{ osd_pool_default_pg_num }}" rule_name: "replicated_rule" + application: "rbd" type: 1 erasure_profile: "" expected_num_objects: "" diff --git a/roles/ceph-client/tasks/create_users_keys.yml b/roles/ceph-client/tasks/create_users_keys.yml index 98d0a39fa..e1ee3aaa2 100644 --- a/roles/ceph-client/tasks/create_users_keys.yml +++ b/roles/ceph-client/tasks/create_users_keys.yml @@ -113,6 +113,15 @@ - pools | length > 0 - item.size | default(osd_pool_default_size) != ceph_osd_pool_default_size + - name: assign application to pool(s) + command: "{{ docker_exec_cmd | default('') }} ceph --cluster {{ cluster }} osd pool application enable {{ item.name }} {{ item.application }}" + with_items: "{{ pools | unique }}" + changed_when: false + delegate_to: "{{ delegated_node }}" + when: + - item.application is defined + + - name: get client cephx keys copy: dest: "{{ item.source }}"