docker-common: rename role

rename `ceph-docker-common` role to `ceph-container-common`

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

CONTRIBUTING.md

@@ -54,7 +54,7 @@ It means if you are pushing a patch modifying one of these files:
 - `./roles/ceph-iscsi-gw/defaults/main.yml`
 - `./roles/ceph-mon/defaults/main.yml`
 - `./roles/ceph-rgw/defaults/main.yml`
-- `./roles/ceph-docker-common/defaults/main.yml`
+- `./roles/ceph-container-common/defaults/main.yml`
 - `./roles/ceph-common-coreos/defaults/main.yml`
 
 You will have to get the corresponding sample file updated, there is a script which do it for you.

contrib/push-roles-to-ansible-galaxy.sh

@@ -4,7 +4,7 @@ set -xe
 # VARIABLES
 BASEDIR=$(dirname "$0")
 LOCAL_BRANCH=$(cd $BASEDIR && git rev-parse --abbrev-ref HEAD)
-ROLES="ceph-common ceph-mon ceph-osd ceph-mds ceph-rgw ceph-agent ceph-fetch-keys ceph-rbd-mirror ceph-client ceph-docker-common ceph-mgr ceph-defaults ceph-config"
+ROLES="ceph-common ceph-mon ceph-osd ceph-mds ceph-rgw ceph-restapi ceph-agent ceph-fetch-keys ceph-rbd-mirror ceph-client ceph-container-common ceph-mgr ceph-defaults ceph-config"
 
 
 # FUNCTIONS

generate_group_vars_sample.sh

@@ -7,7 +7,7 @@ set -euo pipefail
 #############
 
 basedir=$(dirname "$0")
-do_not_generate="ceph-common$|ceph-docker-common$" # pipe separated list of roles we don't want to generate sample file, MUST end with '$', e.g: 'foo$|bar$'
+do_not_generate="ceph-common$|ceph-container-common$" # pipe separated list of roles we don't want to generate sample file, MUST end with '$', e.g: 'foo$|bar$'
 
 
 #############

infrastructure-playbooks/add-osd.yml

@@ -1,7 +1,7 @@
 ---
 # This playbook is used to add a new OSD to
 # an existing cluster without the need for running
-# the ceph-docker-common or ceph-common and ceph-mon role again against all
+# the ceph-container-common or ceph-common and ceph-mon role again against all
 # of the existing monitors.
 #
 # It can run from any machine. Even if the fetch directory is not present
@@ -80,7 +80,7 @@
         private: false
 
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
       when: containerized_deployment | bool
 

infrastructure-playbooks/rolling_update.yml

@@ -130,7 +130,7 @@
         private: false
       when: not containerized_deployment
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
       when: containerized_deployment
     - import_role:
@@ -309,7 +309,7 @@
         private: false
       when: not containerized_deployment
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
       when: containerized_deployment
     - import_role:
@@ -380,7 +380,7 @@
         private: false
       when: not containerized_deployment
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
       when: containerized_deployment
     - import_role:
@@ -530,7 +530,7 @@
         private: false
       when: not containerized_deployment
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
       when: containerized_deployment
     - import_role:
@@ -585,7 +585,7 @@
         private: false
       when: not containerized_deployment
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
       when: containerized_deployment
     - import_role:
@@ -648,7 +648,7 @@
         private: false
       when: not containerized_deployment
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
       when: containerized_deployment
     - import_role:
@@ -707,7 +707,7 @@
         private: false
       when: not containerized_deployment
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
       when: containerized_deployment
     - import_role:
@@ -769,7 +769,7 @@
         private: false
       when: not containerized_deployment
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
       when: containerized_deployment
     - import_role:
@@ -807,7 +807,7 @@
         private: false
       when: not containerized_deployment
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
       when: containerized_deployment
     - import_role:

infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml

@@ -105,7 +105,7 @@
       failed_when: false
       when: ldb_files.rc == 0
 
-    - name: copy mon initial keyring in /etc/ceph to satisfy fetch config task in ceph-docker-common
+    - name: copy mon initial keyring in /etc/ceph to satisfy fetch config task in ceph-container-common
       command: cp /var/lib/ceph/mon/{{ cluster }}-{{ ansible_hostname }}/keyring /etc/ceph/{{ cluster }}.mon.keyring
       args:
         creates: /etc/ceph/{{ cluster }}.mon.keyring
@@ -119,13 +119,14 @@
         name: ceph-handler
         private: false
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
     - import_role:
         name: ceph-mon
         private: false
 
     # post-tasks for preceding import -
+  post_tasks:
     # We don't do a container test by running 'docker exec ...' since not all the monitors have switched to containers yet.
     # Thus, we continue to use the 'ceph' binary from the host, there is no issue with that.
     - name: non container | waiting for the monitor to join the quorum...
@@ -186,7 +187,7 @@
         private: false
 
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
 
     - import_role:
@@ -311,7 +312,7 @@
         private: false
 
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
 
     - import_role:
@@ -384,7 +385,7 @@
         private: false
 
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
 
     - import_role:
@@ -438,7 +439,7 @@
         private: false
 
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
 
     - import_role:
@@ -491,7 +492,7 @@
         private: false
 
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
 
     - import_role:
@@ -549,7 +550,7 @@
         private: false
 
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
 
     - import_role:

roles/ceph-config/tasks/main.yml

@@ -119,7 +119,7 @@
   when:
     - not containerized_deployment|bool
 
-# ceph-docker-common
+# ceph-container-common
 # only create fetch directory when:
 # we are not populating kv_store with default ceph.conf AND host is a mon
 # OR

roles/ceph.ceph-container-common

@@ -0,0 +1 @@
+ceph-container-common

site-docker.yml.sample

@@ -64,7 +64,7 @@
         name: ceph-handler
         private: false
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
       tags: [with_pkg, fetch_container_image]
       when:
@@ -103,7 +103,7 @@
         name: ceph-handler
         private: false
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
     - import_role:
         name: ceph-config
@@ -145,7 +145,7 @@
         name: ceph-handler
         private: false
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
     - import_role:
         name: ceph-config
@@ -185,7 +185,7 @@
         name: ceph-handler
         private: false
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
     - import_role:
         name: ceph-config
@@ -225,7 +225,7 @@
         name: ceph-handler
         private: false
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
     - import_role:
         name: ceph-config
@@ -265,7 +265,7 @@
         name: ceph-handler
         private: false
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
     - import_role:
         name: ceph-config
@@ -305,7 +305,7 @@
         name: ceph-handler
         private: false
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
     - import_role:
         name: ceph-config
@@ -345,7 +345,7 @@
         name: ceph-handler
         private: false
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
     - import_role:
         name: ceph-config
@@ -385,7 +385,7 @@
         name: ceph-handler
         private: false
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
       when:
         - inventory_hostname == groups.get('clients', ['']) | first
@@ -429,7 +429,7 @@
         name: ceph-handler
         private: false
     - import_role:
-        name: ceph-docker-common
+        name: ceph-container-common
         private: false
     - import_role:
         name: ceph-config
@@ -440,6 +440,7 @@
         private: false
 
     # post-tasks for preceding imports -
+  post_tasks:
     - name: set ceph iscsi gw install 'Complete'
       run_once: true
       set_stats: