container: rename docker directories

Those 2 directories should be renamed to be more generic (docker vs.
podman).

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 19950b5170950d8eae7360ebf54adaad978e9024)

diff --git a/roles/ceph-rbd-mirror/tasks/container/main.yml b/roles/ceph-rbd-mirror/tasks/container/main.yml
new file mode 100644 (file)
index 0000000..8c2e8a8
--- /dev/null
+++ b/roles/ceph-rbd-mirror/tasks/container/main.yml
@@ -0,0 +1,3 @@
+---
+- name: include start_docker_rbd_mirror.yml
+  include_tasks: start_docker_rbd_mirror.yml

diff --git a/roles/ceph-rbd-mirror/tasks/container/start_docker_rbd_mirror.yml b/roles/ceph-rbd-mirror/tasks/container/start_docker_rbd_mirror.yml
new file mode 100644 (file)
index 0000000..36ded05
--- /dev/null
+++ b/roles/ceph-rbd-mirror/tasks/container/start_docker_rbd_mirror.yml
@@ -0,0 +1,18 @@
+---
+# Use systemd to manage container on Atomic host
+- name: generate systemd unit file
+  template:
+    src: "{{ role_path }}/templates/ceph-rbd-mirror.service.j2"
+    dest: /etc/systemd/system/ceph-rbd-mirror@.service
+    owner: "root"
+    group: "root"
+    mode: "0644"
+  notify: restart ceph rbdmirrors
+
+- name: systemd start rbd mirror container
+  systemd:
+    name: ceph-rbd-mirror@rbd-mirror.{{ ansible_hostname }}
+    state: started
+    enabled: yes
+    masked: no
+    daemon_reload: yes

diff --git a/roles/ceph-rbd-mirror/tasks/docker/main.yml b/roles/ceph-rbd-mirror/tasks/docker/main.yml
deleted file mode 100644 (file)
index 8c2e8a8..0000000
--- a/roles/ceph-rbd-mirror/tasks/docker/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: include start_docker_rbd_mirror.yml
-  include_tasks: start_docker_rbd_mirror.yml

diff --git a/roles/ceph-rbd-mirror/tasks/docker/start_docker_rbd_mirror.yml b/roles/ceph-rbd-mirror/tasks/docker/start_docker_rbd_mirror.yml
deleted file mode 100644 (file)
index 36ded05..0000000
--- a/roles/ceph-rbd-mirror/tasks/docker/start_docker_rbd_mirror.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# Use systemd to manage container on Atomic host
-- name: generate systemd unit file
-  template:
-    src: "{{ role_path }}/templates/ceph-rbd-mirror.service.j2"
-    dest: /etc/systemd/system/ceph-rbd-mirror@.service
-    owner: "root"
-    group: "root"
-    mode: "0644"
-  notify: restart ceph rbdmirrors
-
-- name: systemd start rbd mirror container
-  systemd:
-    name: ceph-rbd-mirror@rbd-mirror.{{ ansible_hostname }}
-    state: started
-    enabled: yes
-    masked: no
-    daemon_reload: yes

diff --git a/roles/ceph-rbd-mirror/tasks/main.yml b/roles/ceph-rbd-mirror/tasks/main.yml
index c2981006962d6e459916645c5c8bf09b09abcf23..e52cd68a7eb21266829ad78eb73a6c2aad5b0e6a 100644 (file)
--- a/roles/ceph-rbd-mirror/tasks/main.yml
+++ b/roles/ceph-rbd-mirror/tasks/main.yml
@@ -24,5 +24,5 @@
       set_fact:
         container_exec_cmd: "{{ container_binary }} exec ceph-rbd-mirror-{{ ansible_hostname }}"
 
-    - name: include docker/main.yml
-      include_tasks: docker/main.yml
+    - name: include container/main.yml
+      include_tasks: container/main.yml

diff --git a/roles/ceph-rgw/tasks/container/main.yml b/roles/ceph-rgw/tasks/container/main.yml
new file mode 100644 (file)
index 0000000..539c423
--- /dev/null
+++ b/roles/ceph-rgw/tasks/container/main.yml
@@ -0,0 +1,3 @@
+---
+- name: include start_docker_rgw.yml
+  include_tasks: start_docker_rgw.yml

diff --git a/roles/ceph-rgw/tasks/container/start_docker_rgw.yml b/roles/ceph-rgw/tasks/container/start_docker_rgw.yml
new file mode 100644 (file)
index 0000000..0346b96
--- /dev/null
+++ b/roles/ceph-rgw/tasks/container/start_docker_rgw.yml
@@ -0,0 +1,29 @@
+---
+- name: generate environment file
+  copy:
+    dest: "/var/lib/ceph/radosgw/{{ cluster }}-rgw.{{ ansible_hostname }}.{{ item.instance_name }}/EnvironmentFile"
+    owner: "root"
+    group: "root"
+    mode: "0644"
+    content: |
+      INST_NAME={{ item.instance_name }}
+      INST_PORT={{ item.radosgw_frontend_port }}
+  with_items: "{{ rgw_instances }}"
+
+- name: generate systemd unit file
+  template:
+    src: "{{ role_path }}/templates/ceph-radosgw.service.j2"
+    dest: /etc/systemd/system/ceph-radosgw@.service
+    owner: "root"
+    group: "root"
+    mode: "0644"
+  notify: restart ceph rgws
+
+- name: systemd start rgw container
+  systemd:
+    name: ceph-radosgw@rgw.{{ ansible_hostname }}.{{ item.instance_name }}
+    state: started
+    enabled: yes
+    masked: no
+    daemon_reload: yes
+  with_items: "{{ rgw_instances }}"

diff --git a/roles/ceph-rgw/tasks/docker/main.yml b/roles/ceph-rgw/tasks/docker/main.yml
deleted file mode 100644 (file)
index 539c423..0000000
--- a/roles/ceph-rgw/tasks/docker/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: include start_docker_rgw.yml
-  include_tasks: start_docker_rgw.yml

diff --git a/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml b/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml
deleted file mode 100644 (file)
index 0346b96..0000000
--- a/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- name: generate environment file
-  copy:
-    dest: "/var/lib/ceph/radosgw/{{ cluster }}-rgw.{{ ansible_hostname }}.{{ item.instance_name }}/EnvironmentFile"
-    owner: "root"
-    group: "root"
-    mode: "0644"
-    content: |
-      INST_NAME={{ item.instance_name }}
-      INST_PORT={{ item.radosgw_frontend_port }}
-  with_items: "{{ rgw_instances }}"
-
-- name: generate systemd unit file
-  template:
-    src: "{{ role_path }}/templates/ceph-radosgw.service.j2"
-    dest: /etc/systemd/system/ceph-radosgw@.service
-    owner: "root"
-    group: "root"
-    mode: "0644"
-  notify: restart ceph rgws
-
-- name: systemd start rgw container
-  systemd:
-    name: ceph-radosgw@rgw.{{ ansible_hostname }}.{{ item.instance_name }}
-    state: started
-    enabled: yes
-    masked: no
-    daemon_reload: yes
-  with_items: "{{ rgw_instances }}"

diff --git a/roles/ceph-rgw/tasks/main.yml b/roles/ceph-rgw/tasks/main.yml
index 84ca62ff4dcbb351917a83646c31c51ee8d56614..df0e8bc3ee3a460c72357d3a0b4688d354134671 100644 (file)
--- a/roles/ceph-rgw/tasks/main.yml
+++ b/roles/ceph-rgw/tasks/main.yml
@@ -14,8 +14,8 @@
   include_tasks: start_radosgw.yml
   when: not containerized_deployment | bool
 
-- name: include_tasks docker/main.yml
-  include_tasks: docker/main.yml
+- name: include_tasks container/main.yml
+  include_tasks: container/main.yml
   when: containerized_deployment | bool
 
 - name: include_tasks multisite/main.yml