]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Refact code 1469/head
authorGuillaume Abrioux <gabrioux@redhat.com>
Wed, 12 Apr 2017 17:57:33 +0000 (19:57 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Wed, 24 May 2017 13:55:41 +0000 (15:55 +0200)
`ceph-docker-common`:
  At the moment there is a lot of duplicated tasks in each
  `./roles/ceph-<role>/tasks/docker/main.yml` that could be refactored in
  `./roles/ceph-docker-common/tasks/main.yml`.

`*_containerized_deployment` variables:
  All `*_containerized_deployment` have been refactored to a single
  variable `containerized_deployment`

duplicate `cephx` variables in `group_vars/* have been removed.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
87 files changed:
Vagrantfile
group_vars/all.yml.sample
group_vars/mdss.yml.sample
group_vars/mgrs.yml.sample
group_vars/mons.yml.sample
group_vars/nfss.yml.sample
group_vars/osds.yml.sample
group_vars/rbd-mirrors.yml.sample
group_vars/restapis.yml.sample
group_vars/rgws.yml.sample
infrastructure-playbooks/rolling_update.yml
roles/ceph-common/defaults/main.yml
roles/ceph-common/tasks/docker/fetch_image.yml [deleted file]
roles/ceph-common/tasks/facts.yml
roles/ceph-common/tasks/generate_cluster_fsid.yml
roles/ceph-common/templates/ceph.conf.j2
roles/ceph-docker-common/defaults/main.yml
roles/ceph-docker-common/tasks/checks.yml [new file with mode: 0644]
roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml [new file with mode: 0644]
roles/ceph-docker-common/tasks/checks/check_ntp_debian.yml [new file with mode: 0644]
roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml [new file with mode: 0644]
roles/ceph-docker-common/tasks/create_configs.yml [new file with mode: 0644]
roles/ceph-docker-common/tasks/dirs_permissions.yml [new file with mode: 0644]
roles/ceph-docker-common/tasks/fetch_configs.yml [new file with mode: 0644]
roles/ceph-docker-common/tasks/fetch_image.yml [new file with mode: 0644]
roles/ceph-docker-common/tasks/main.yml
roles/ceph-docker-common/tasks/misc/ntp_atomic.yml [new file with mode: 0644]
roles/ceph-docker-common/tasks/misc/ntp_debian.yml [new file with mode: 0644]
roles/ceph-docker-common/tasks/misc/ntp_redhat.yml [new file with mode: 0644]
roles/ceph-docker-common/tasks/selinux.yml [new file with mode: 0644]
roles/ceph-mds/defaults/main.yml
roles/ceph-mds/meta/main.yml
roles/ceph-mds/tasks/docker/checks.yml [deleted file]
roles/ceph-mds/tasks/docker/main.yml
roles/ceph-mds/tasks/main.yml
roles/ceph-mds/templates/ceph-mds.service.j2
roles/ceph-mgr/defaults/main.yml
roles/ceph-mgr/meta/main.yml
roles/ceph-mgr/tasks/docker/checks.yml [deleted file]
roles/ceph-mgr/tasks/docker/main.yml
roles/ceph-mgr/tasks/main.yml
roles/ceph-mgr/templates/ceph-mgr.service.j2
roles/ceph-mon/defaults/main.yml
roles/ceph-mon/meta/main.yml
roles/ceph-mon/tasks/ceph_keys.yml
roles/ceph-mon/tasks/docker/checks.yml [deleted file]
roles/ceph-mon/tasks/docker/create_configs.yml [deleted file]
roles/ceph-mon/tasks/docker/main.yml
roles/ceph-mon/tasks/docker/start_docker_monitor.yml
roles/ceph-mon/tasks/main.yml
roles/ceph-mon/templates/ceph-mon.service.j2
roles/ceph-nfs/defaults/main.yml
roles/ceph-nfs/meta/main.yml
roles/ceph-nfs/tasks/docker/checks.yml [deleted file]
roles/ceph-nfs/tasks/docker/create_configs.yml [deleted file]
roles/ceph-nfs/tasks/docker/main.yml
roles/ceph-nfs/tasks/main.yml
roles/ceph-nfs/templates/ceph-nfs.service.j2
roles/ceph-osd/defaults/main.yml
roles/ceph-osd/meta/main.yml
roles/ceph-osd/tasks/check_mandatory_vars.yml
roles/ceph-osd/tasks/docker/checks.yml [deleted file]
roles/ceph-osd/tasks/docker/main.yml
roles/ceph-osd/tasks/docker/start_docker_osd.yml
roles/ceph-osd/tasks/main.yml
roles/ceph-osd/templates/ceph-osd-run.sh.j2
roles/ceph-rbd-mirror/defaults/main.yml
roles/ceph-rbd-mirror/meta/main.yml
roles/ceph-rbd-mirror/tasks/docker/checks.yml [deleted file]
roles/ceph-rbd-mirror/tasks/docker/main.yml
roles/ceph-rbd-mirror/tasks/main.yml
roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
roles/ceph-restapi/defaults/main.yml
roles/ceph-restapi/meta/main.yml
roles/ceph-restapi/tasks/docker/main.yml
roles/ceph-restapi/tasks/main.yml
roles/ceph-rgw/defaults/main.yml
roles/ceph-rgw/meta/main.yml
roles/ceph-rgw/tasks/docker/checks.yml [deleted file]
roles/ceph-rgw/tasks/docker/main.yml
roles/ceph-rgw/tasks/main.yml
roles/ceph-rgw/templates/ceph-rgw.service.j2
tests/functional/centos/7/docker-cluster-dedicated-journal/Vagrantfile
tests/functional/centos/7/docker-cluster-dedicated-journal/group_vars/all
tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/Vagrantfile
tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/group_vars/all
tests/functional/centos/7/docker-cluster/group_vars/all

index 910f6bdf94c5d4dadd1109ab88d52ff4a8e54f0e..19d93e8fc0db21ae17ee7fadee3f779c37363bdf 100644 (file)
@@ -73,14 +73,7 @@ ansible_provision = proc do |ansible|
   # In a production deployment, these should be secret
   if DOCKER then
     ansible.extra_vars = ansible.extra_vars.merge({
-      mon_containerized_deployment: 'true',
-      osd_containerized_deployment: 'true',
-      mds_containerized_deployment: 'true',
-      rgw_containerized_deployment: 'true',
-      nfs_containerized_deployment: 'true',
-      restapi_containerized_deployment: 'true',
-      rbd_mirror_containerized_deployment: 'true',
-      mgr_containerized_deployment: 'true',
+      containerized_deployment: 'true',
       ceph_mon_docker_interface: ETH,
       ceph_mon_docker_subnet: "#{PUBLIC_SUBNET}.0/24",
       ceph_osd_docker_devices: settings['disks'],
index 8df17f1e523c8aca80c0b10415ebb6b008091d2c..39c84a28532890dd643b73fe20d5e4e8a52f7a63 100644 (file)
@@ -386,10 +386,10 @@ dummy:
 #ceph_docker_image: "ceph/daemon"
 #ceph_docker_image_tag: latest
 
-# Do not comment the following variables mon_containerized_deployment_* here. These variables are being used
+# Do not comment the following variables containerized_deployment_* here. These variables are being used
 # by ceph.conf.j2 template. so it should always be defined
-#mon_containerized_deployment_with_kv: false
-#mon_containerized_deployment: false
+#containerized_deployment_with_kv: false
+#containerized_deployment: false
 #mon_containerized_default_ceph_conf_with_kv: false
 
 # Confiure the type of NFS gatway access.  At least one must be enabled for an
@@ -404,6 +404,8 @@ dummy:
 # do not ever change this here
 #rolling_update: false
 
+#fsid: "{{ cluster_uuid.stdout }}"
+#generate_fsid: true
 #ceph_docker_registry: docker.io
 #ceph_docker_enable_centos_extra_repo: false
 
@@ -414,4 +416,12 @@ dummy:
 # These values have to be set according to the base OS used by the container image, NOT the host.
 #bootstrap_dirs_owner: "64045"
 #bootstrap_dirs_group: "64045"
+#
+############
+# KV store #
+############
+#kv_type: etcd
+#kv_endpoint: 127.0.0.1
+#kv_port: 4001
+#containerized_deployment_with_kv: false
 
index d49dfd2569210bd8383b38ec21160fdcf7b11916..084f40994709634fb28e881af47daf4ff3a18c9a 100644 (file)
@@ -21,20 +21,10 @@ dummy:
 # will copy the admin key to the /etc/ceph/ directory
 #copy_admin_key: false
 
-#cephx: true
-
-
 ##########
 # DOCKER #
 ##########
 
-#mds_containerized_deployment: false
-#mds_containerized_deployment_with_kv: false
-#kv_type: etcd
-#kv_endpoint: 127.0.0.1
-#ceph_docker_image: "ceph/daemon"
-#ceph_docker_image_tag: latest
 #ceph_mds_docker_extra_env: -e CLUSTER={{ cluster }} -e MDS_NAME={{ ansible_hostname }}
-#ceph_docker_on_openstack: false
 #ceph_config_keys: [] # DON'T TOUCH ME
 
index c4c60fc66ad3174b9a67282c947c2e3c20a3bfd2..787e3cc786abe4804cae45e8f4785ae72195cfc2 100644 (file)
@@ -11,13 +11,6 @@ dummy:
 # DOCKER #
 ##########
 
-#mgr_containerized_deployment: false
-#mgr_containerized_deployment_with_kv: false
-#kv_type: etcd
-#kv_endpoint: 127.0.0.1
-#ceph_docker_image: "ceph/daemon"
-#ceph_docker_image_tag: latest
 #ceph_mgr_docker_extra_env: -e CLUSTER={{ cluster }} -e MGR_NAME={{ ansible_hostname }}
-#ceph_docker_on_openstack: false
 #ceph_config_keys: [] # DON'T TOUCH ME
 
index 620a23cb264dc4dc6a4ad9bb11a324d664bc7a4b..838dfa230d589dba089ee4263a204ed4a472936f 100644 (file)
@@ -20,7 +20,6 @@ dummy:
 # ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT
 #fsid: "{{ cluster_uuid.stdout }}"
 #monitor_secret: "{{ monitor_keyring.stdout }}"
-#cephx: true
 
 # CephFS
 #cephfs_data: cephfs_data
@@ -78,16 +77,9 @@ dummy:
 # DOCKER #
 ##########
 #docker_exec_cmd:
-#mon_containerized_deployment: false
-#mon_containerized_deployment_with_kv: false
-# This is currently in ceph-common defaults because it is shared with ceph-nfs
-#mon_containerized_default_ceph_conf_with_kv: false
 #ceph_mon_docker_interface: "{{ monitor_interface }}"
 #ceph_mon_docker_subnet: "{{ public_network }}"# subnet of the ceph_mon_docker_interface
-#ceph_docker_image: "ceph/daemon"
-#ceph_docker_image_tag: latest
 #ceph_mon_docker_extra_env: -e CLUSTER={{ cluster }} -e FSID={{ fsid }} -e MON_NAME={{ monitor_name }}
-#ceph_docker_on_openstack: false
 #mon_docker_privileged: false
 #mon_docker_net_host: true
 #ceph_config_keys: [] # DON'T TOUCH ME
index 4433f6f9f96ed8b53e59e30ad6229b755e544d05..011f0cc2519f9ab9af45ad47e6b4a0851956823e 100644 (file)
@@ -15,11 +15,6 @@ dummy:
 
 #fetch_directory: fetch/
 
-## Ceph options
-#
-#cephx: true
-
-
 #######################
 # Access type options #
 #######################
@@ -81,13 +76,8 @@ dummy:
 # DOCKER #
 ##########
 
-#nfs_containerized_deployment: false
-#nfs_containerized_deployment_with_kv: false
-#kv_type: etcd
-#kv_endpoint: 127.0.0.1
 #ceph_docker_image: "ceph/ganesha"
 #ceph_docker_image_tag: latest
 #ceph_nfs_docker_extra_env: -e GANESHA_EPOCH={{ ganesha_epoch }}
-#ceph_docker_on_openstack: false
 #ceph_config_keys: [] # DON'T TOUCH ME
 
index c8f67b946a0afcc5f0c3688938bb4eeeed544e83..d2b2124e8153421ad484ca7f5fdf82ac66ba5129 100644 (file)
@@ -60,7 +60,6 @@ dummy:
 
 # ACTIVATE THE FSID VARIABLE FOR NON-VAGRANT DEPLOYMENT
 #fsid: "{{ cluster_uuid.stdout }}"
-#cephx: true
 
 # Devices to be used as OSDs
 # You can pre-provision disks that are not present yet.
@@ -158,15 +157,7 @@ dummy:
 # DOCKER #
 ##########
 
-#osd_containerized_deployment: false
-#osd_containerized_deployment_with_kv: false
-#kv_type: etcd
-#kv_endpoint: 127.0.0.1
-#kv_port: 4001
-#ceph_docker_image: "ceph/daemon"
-#ceph_docker_image_tag: latest
 #ceph_config_keys: [] # DON'T TOUCH ME
-#ceph_docker_on_openstack: false
 
 # PREPARE DEVICE
 # Make sure you only pass a single device to raw_journal_devices, otherwise this will fail horribly.
index 22d1933d7e105a9170667bd706293a9698e0e0b4..4be7cfd7ed00e4d0a1f562bc53415450d0c58ce4 100644 (file)
@@ -42,12 +42,5 @@ dummy:
 # DOCKER #
 ##########
 
-#rbd_mirror_containerized_deployment: false
-#rbd_mirror_containerized_deployment_with_kv: false
-#kv_type: etcd
-#kv_endpoint: 127.0.0.1
-#ceph_docker_image: "ceph/daemon"
-#ceph_docker_image_tag: latest
-#ceph_docker_on_openstack: false
 #ceph_config_keys: [] # DON'T TOUCH ME
 
index 425e56a1fa152cab0924b4953a215b72a097c4f4..034b936cc0b51bb8387104bd115d113fd5396fc8 100644 (file)
@@ -18,12 +18,8 @@ dummy:
 # DOCKER #
 ##########
 
-#restapi_containerized_deployment: false
 #ceph_restapi_docker_interface: eth0
 #ceph_restapi_port: 5000
-#ceph_docker_image: "ceph/daemon"
-#ceph_docker_image_tag: latest
 #ceph_restapi_docker_extra_env: "RESTAPI_IP=0.0.0.0" # comma separated variables
-#ceph_docker_on_openstack: false
 #ceph_config_keys: [] # DON'T TOUCH ME
 
index ad9d2f80371b9520dabf04835ebcf24c085f51b4..22e2eeb043e9aff74dc7e6590cdeb17550bf976c 100644 (file)
@@ -21,10 +21,6 @@ dummy:
 # will copy the admin key to the /etc/ceph/ directory
 #copy_admin_key: false
 
-## Ceph options
-#
-#cephx: true
-
 # Multi-site remote pull URL variables
 #rgw_pull_port: "{{ radosgw_civetweb_port }}"
 #rgw_pull_proto: "http"
@@ -59,15 +55,8 @@ dummy:
 # DOCKER #
 ##########
 
-#rgw_containerized_deployment: false
-#rgw_containerized_deployment_with_kv: false
-#kv_type: etcd
-#kv_endpoint: 127.0.0.1
 #ceph_rgw_civetweb_port: "{{ radosgw_civetweb_port }}"
-#ceph_docker_image: "ceph/daemon"
-#ceph_docker_image_tag: latest
 #ceph_rgw_docker_extra_env: -e CLUSTER={{ cluster }} -e RGW_CIVETWEB_PORT={{ ceph_rgw_civetweb_port }}
-#ceph_docker_on_openstack: false
 #ceph_config_keys: [] # DON'T TOUCH ME
 #rgw_config_keys: "/" # DON'T TOUCH ME
 
index 1853b80a1a5b4619bcac9dcfda351c667e5e4191..3a0e892d6d97f27341b2d05dbc1ae7419055ffe5 100644 (file)
@@ -88,7 +88,7 @@
         enabled: yes
       when:
         - ansible_service_mgr == 'systemd'
-        - not mon_containerized_deployment
+        - not containerized_deployment
 
   roles:
     - ceph-mon
         enabled: yes
       when:
         - ansible_service_mgr == 'systemd'
-        - not mon_containerized_deployment
+        - not containerized_deployment
 
     - name: restart containerized ceph mons with systemd
       service:
         enabled: yes
       when:
         - ansible_service_mgr == 'systemd'
-        - mon_containerized_deployment
+        - containerized_deployment
 
     - name: set mon_host_count
       set_fact: mon_host_count={{ groups[mon_group_name] | length }}
       retries: "{{ health_mon_check_retries }}"
       delay: "{{ health_mon_check_delay }}"
       delegate_to: "{{ mon_host }}"
-      when: not mon_containerized_deployment
+      when: not containerized_deployment
 
     - name: waiting for the containerized monitor to join the quorum...
       shell: |
       retries: "{{ health_mon_check_retries }}"
       delay: "{{ health_mon_check_delay }}"
       delegate_to: "{{ mon_host }}"
-      when: mon_containerized_deployment
+      when: containerized_deployment
 
 
 - name: upgrade ceph osds cluster
         - noscrub
         - nodeep-scrub
       delegate_to: "{{ groups[mon_group_name][0] }}"
-      when: not mon_containerized_deployment
+      when: not containerized_deployment
 
     - name: set containerized osd flags
       command: |
         - noscrub
         - nodeep-scrub
       delegate_to: "{{ groups[mon_group_name][0] }}"
-      when: mon_containerized_deployment
+      when: containerized_deployment
 
     - name: get osd numbers
       shell: "if [ -d /var/lib/ceph/osd ] ; then ls /var/lib/ceph/osd | sed 's/.*-//' ; fi"
       register: osd_ids
       changed_when: false
-      when: not osd_containerized_deployment
+      when: not containerized_deployment
 
     - name: stop ceph osds with upstart
       service:
       with_items: "{{ osd_ids.stdout_lines }}"
       when:
         - ansible_service_mgr == 'systemd'
-        - not osd_containerized_deployment
+        - not containerized_deployment
 
   roles:
     - ceph-osd
       shell: "if [ -d /var/lib/ceph/osd ] ; then ls /var/lib/ceph/osd | sed 's/.*-//' ; fi"
       register: osd_ids
       changed_when: false
-      when: not osd_containerized_deployment
+      when: not containerized_deployment
 
     - name: start ceph osds with upstart
       service:
       with_items: "{{ osd_ids.stdout_lines }}"
       when:
         - ansible_service_mgr == 'systemd'
-        - not osd_containerized_deployment
+        - not containerized_deployment
 
     - name: restart containerized ceph osds with systemd
       service:
       with_items: "{{ ceph_osd_docker_devices }}"
       when:
         - ansible_service_mgr == 'systemd'
-        - osd_containerized_deployment
+        - containerized_deployment
 
     - name: waiting for clean pgs...
       shell: |
       retries: "{{ health_osd_check_retries }}"
       delay: "{{ health_osd_check_delay }}"
       delegate_to: "{{ groups[mon_group_name][0] }}"
-      when: not osd_containerized_deployment
+      when: not containerized_deployment
 
     - name: container - waiting for clean pgs...
       shell: |
       retries: "{{ health_osd_check_retries }}"
       delay: "{{ health_osd_check_delay }}"
       delegate_to: "{{ groups[mon_group_name][0] }}"
-      when: osd_containerized_deployment
+      when: containerized_deployment
 
     - name: unset osd flags
       command: ceph osd unset {{ item }} --cluster {{ cluster }}
         - noscrub
         - nodeep-scrub
       delegate_to: "{{ groups[mon_group_name][0] }}"
-      when: not osd_containerized_deployment
+      when: not containerized_deployment
 
     - name: unset containerized osd flags
       command: |
         - noscrub
         - nodeep-scrub
       delegate_to: "{{ groups[mon_group_name][0] }}"
-      when: osd_containerized_deployment
+      when: containerized_deployment
 
 
 - name: upgrade ceph mdss cluster
         enabled: yes
       when:
         - ansible_service_mgr == 'systemd'
-        - not mds_containerized_deployment
+        - not containerized_deployment
 
   roles:
     - ceph-mds
         enabled: yes
       when:
         - ansible_service_mgr == 'systemd'
-        - not mds_containerized_deployment
+        - not containerized_deployment
 
     - name: restart ceph mdss
       service:
         enabled: yes
       when:
         - ansible_service_mgr == 'systemd'
-        - mds_containerized_deployment
+        - containerized_deployment
 
 
 - name: upgrade ceph rgws cluster
         enabled: yes
       when:
         - ansible_service_mgr == 'systemd'
-        - not rgw_containerized_deployment
+        - not containerized_deployment
 
   roles:
     - ceph-rgw
         enabled: yes
       when:
         - ansible_service_mgr == 'systemd'
-        - not rgw_containerized_deployment
+        - not containerized_deployment
 
     - name: restart containerized ceph rgws with systemd
       service:
         enabled: yes
       when:
         - ansible_service_mgr == 'systemd'
-        - rgw_containerized_deployment
+        - containerized_deployment
index d64009490abd8f91022ee68b201224e4eaff4e8a..699aa8b27c2bce1786334660e4992750950f7368 100644 (file)
@@ -378,10 +378,10 @@ docker: false
 ceph_docker_image: "ceph/daemon"
 ceph_docker_image_tag: latest
 
-# Do not comment the following variables mon_containerized_deployment_* here. These variables are being used
+# Do not comment the following variables containerized_deployment_* here. These variables are being used
 # by ceph.conf.j2 template. so it should always be defined
-mon_containerized_deployment_with_kv: false
-mon_containerized_deployment: false
+containerized_deployment_with_kv: false
+containerized_deployment: false
 mon_containerized_default_ceph_conf_with_kv: false
 
 # Confiure the type of NFS gatway access.  At least one must be enabled for an
diff --git a/roles/ceph-common/tasks/docker/fetch_image.yml b/roles/ceph-common/tasks/docker/fetch_image.yml
deleted file mode 100644 (file)
index 57c76ed..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
----
-# Normal case - pull image from registry
-- name: "pull {{ ceph_docker_image }} image"
-  command: "docker pull {{ ceph_docker_registry}}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
-  changed_when: false
-  when: ceph_docker_dev_image is undefined or not ceph_docker_dev_image
-
-# Dev case - export local dev image and send it across
-- name: export local ceph dev image
-  local_action: command docker save -o "/tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar" "{{ ceph_docker_username }}/{{ ceph_docker_imagename }}:{{ ceph_docker_image_tag }}"
-  when: ceph_docker_dev_image is defined and ceph_docker_dev_image
-  run_once: true
-
-- name: copy ceph dev image file
-  copy:
-    src: "/tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar"
-    dest: "/tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar"
-  when: ceph_docker_dev_image is defined and ceph_docker_dev_image
-
-- name: load ceph dev image
-  command: "docker load -i /tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar"
-  when: ceph_docker_dev_image is defined and ceph_docker_dev_image
-
-- name: remove tmp ceph dev image file
-  command: "rm /tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar"
-  when: ceph_docker_dev_image is defined and ceph_docker_dev_image
index 0e444e00ff45890011d9facfd222d11fa5c3e25a..2056ce9dcd40842ea3edcc777d972a831d1c0d69 100644 (file)
@@ -87,4 +87,3 @@
   when:
     - rbd_client_directory_mode is not defined
       or not rbd_client_directory_mode
-
index bd4d2abe5375eb75c642c663fe2b5d546e8786c0..5f49612cacde2152fb5c2e999b79572401763d13 100644 (file)
@@ -22,3 +22,8 @@
   become: false
   always_run: true
   when: generate_fsid
+
+- name: set fsid fact when generate_fsid = true
+  set_fact:
+    fsid: "{{ cluster_uuid.stdout }}"
+  when: generate_fsid
index d9b3df1592b411419f4c4bdb16bac9906ddc368d..59ff882e9f6cd384f9321c9b2bdd451356ee4b4a 100644 (file)
@@ -11,7 +11,7 @@ auth supported = none
 {% if ip_version == 'ipv6'  %}
 ms bind ipv6 = true
 {% endif %}
-{% if not mon_containerized_deployment_with_kv and not mon_containerized_deployment %}
+{% if not containerized_deployment_with_kv and not containerized_deployment %}
 fsid = {{ fsid }}
 {% endif %}
 max open files = {{ max_open_files }}
@@ -30,7 +30,7 @@ mon initial members = {% for host in groups[mon_group_name] %}
     {% endfor %}
 {% endif %}
 
-{% if not mon_containerized_deployment and not mon_containerized_deployment_with_kv %}
+{% if not containerized_deployment and not containerized_deployment_with_kv %}
 {% if monitor_address_block %}
 mon host = {% for host in groups[mon_group_name] %}{{ hostvars[host]['ansible_all_ipv4_addresses'] | ipaddr(monitor_address_block) | first }}{% if not loop.last %},{% endif %}{% endfor %}
 {% elif groups[mon_group_name] is defined %}
@@ -50,12 +50,12 @@ mon host = {% for host in groups[mon_group_name] %}
            {% endfor %}
 {% endif %}
 {% endif %}
-{% if mon_containerized_deployment %}
+{% if containerized_deployment %}
 fsid = {{ fsid }}
 {% if groups[mon_group_name] is defined %}
 mon host = {% for host in groups[mon_group_name] %}
              {% set interface = ["ansible_",ceph_mon_docker_interface]|join %}
-             {% if mon_containerized_deployment -%}
+             {% if containerized_deployment -%}
                 {{ hostvars[host][interface]['ipv4']['address'] }}
              {%- elif hostvars[host]['monitor_address'] is defined -%}
                 {{ hostvars[host]['monitor_address'] }}
index 86a7f9bb82800306b9e64979bfc3ac2fa4469ccf..0b88fa8a3081e6cec92274f1f778c9fdacb01727 100644 (file)
@@ -1,4 +1,6 @@
 ---
+fsid: "{{ cluster_uuid.stdout }}"
+generate_fsid: true
 ceph_docker_registry: docker.io
 ceph_docker_enable_centos_extra_repo: false
 
@@ -9,3 +11,11 @@ mon_use_fqdn: false # if set to true, the MON name used will be the fqdn
 # These values have to be set according to the base OS used by the container image, NOT the host.
 bootstrap_dirs_owner: "64045"
 bootstrap_dirs_group: "64045"
+#
+############
+# KV store #
+############
+kv_type: etcd
+kv_endpoint: 127.0.0.1
+kv_port: 4001
+containerized_deployment_with_kv: false
diff --git a/roles/ceph-docker-common/tasks/checks.yml b/roles/ceph-docker-common/tasks/checks.yml
new file mode 100644 (file)
index 0000000..968fc03
--- /dev/null
@@ -0,0 +1,28 @@
+---
+- name: set config and keys paths
+  set_fact:
+    ceph_config_keys:
+      - /etc/ceph/{{ cluster }}.client.admin.keyring
+      - /etc/ceph/{{ cluster }}.conf
+      - /etc/ceph/monmap-{{ cluster }}
+      - /etc/ceph/{{ cluster }}.mon.keyring
+      - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
+      - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
+      - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
+
+- name: stat for ceph config and keys
+  stat:
+    path: "{{ item }}"
+  with_items: "{{ ceph_config_keys }}"
+  changed_when: false
+  failed_when: false
+  always_run: true
+  register: statleftover
+
+- name: fail if we find existing cluster files
+  fail:
+    msg: "looks like no cluster is running but ceph files are present, please remove them"
+  with_together:
+    - "{{ ceph_config_keys }}"
+    - "{{ statleftover.results }}"
+  when: item.1.stat.exists == true
diff --git a/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml b/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml
new file mode 100644 (file)
index 0000000..3205083
--- /dev/null
@@ -0,0 +1,7 @@
+---
+- name: check ntp installation on atomic
+  command: rpm -q chrony
+  register: ntp_pkg_query
+  ignore_errors: true
+  always_run: true
+  changed_when: false
diff --git a/roles/ceph-docker-common/tasks/checks/check_ntp_debian.yml b/roles/ceph-docker-common/tasks/checks/check_ntp_debian.yml
new file mode 100644 (file)
index 0000000..7da8f5b
--- /dev/null
@@ -0,0 +1,13 @@
+---
+- name: check ntp installation on debian
+  command: dpkg -s ntp
+  register: ntp_pkg_query
+  ignore_errors: true
+  always_run: true
+  changed_when: false
+  when: ansible_os_family == 'Debian'
+
+- name: install ntp on debian
+  package:
+    name: ntp
+    state: present
diff --git a/roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml b/roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml
new file mode 100644 (file)
index 0000000..0e4772f
--- /dev/null
@@ -0,0 +1,13 @@
+---
+- name: check ntp installation on redhat
+  command: rpm -q ntp
+  register: ntp_pkg_query
+  ignore_errors: true
+  always_run: true
+  changed_when: false
+  when: ansible_os_family == 'RedHat'
+
+- name: install ntp on redhat
+  package:
+    name: ntp
+    state: present
diff --git a/roles/ceph-docker-common/tasks/create_configs.yml b/roles/ceph-docker-common/tasks/create_configs.yml
new file mode 100644 (file)
index 0000000..2ea58c7
--- /dev/null
@@ -0,0 +1,39 @@
+---
+- name: create a local fetch directory if it does not exist
+  local_action: file path={{ fetch_directory }} state=directory
+  changed_when: false
+  become: false
+  run_once: true
+  when: cephx or generate_fsid
+
+- name: generate cluster uuid
+  local_action: shell python -c 'import uuid; print(str(uuid.uuid4()))' | tee {{ fetch_directory }}/ceph_cluster_uuid.conf
+    creates="{{ fetch_directory }}/ceph_cluster_uuid.conf"
+  register: cluster_uuid
+  become: false
+  when: generate_fsid
+
+- name: read cluster uuid if it already exists
+  local_action: command cat {{ fetch_directory }}/ceph_cluster_uuid.conf
+    removes="{{ fetch_directory }}/ceph_cluster_uuid.conf"
+  changed_when: false
+  register: cluster_uuid
+  always_run: true
+  become: false
+  when: generate_fsid
+
+- name: "generate {{ cluster }}.conf configuration file"
+  action: config_template
+  args:
+    src: "{{ playbook_dir }}/roles/ceph-common/templates/ceph.conf.j2"
+    dest: "/etc/ceph/{{ cluster }}.conf"
+    owner: "root"
+    group: "root"
+    mode: "0644"
+    config_overrides: "{{ ceph_conf_overrides }}"
+    config_type: ini
+
+- name: set fsid fact when generate_fsid = true
+  set_fact:
+    fsid: "{{ cluster_uuid.stdout }}"
+  when: generate_fsid
diff --git a/roles/ceph-docker-common/tasks/dirs_permissions.yml b/roles/ceph-docker-common/tasks/dirs_permissions.yml
new file mode 100644 (file)
index 0000000..65997fd
--- /dev/null
@@ -0,0 +1,13 @@
+---
+- name: create bootstrap directories
+  file:
+    path: "{{ item }}"
+    state: directory
+    owner: "{{ bootstrap_dirs_owner }}"
+    group: "{{ bootstrap_dirs_group }}"
+    mode: "0755"
+  with_items:
+    - /etc/ceph/
+    - /var/lib/ceph/bootstrap-osd
+    - /var/lib/ceph/bootstrap-mds
+    - /var/lib/ceph/bootstrap-rgw
diff --git a/roles/ceph-docker-common/tasks/fetch_configs.yml b/roles/ceph-docker-common/tasks/fetch_configs.yml
new file mode 100644 (file)
index 0000000..a96f34c
--- /dev/null
@@ -0,0 +1,50 @@
+---
+- name: set config and keys paths
+  set_fact:
+    ceph_config_keys:
+      - /etc/ceph/{{ cluster }}.conf
+      - /etc/ceph/{{ cluster }}.client.admin.keyring
+      - /etc/ceph/monmap-{{ cluster }}
+      - /etc/ceph/{{ cluster }}.mon.keyring
+      - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
+      - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
+      - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
+
+- name: add mgr keys to config and keys paths
+  set_fact:
+    tmp_ceph_mgr_keys: /etc/ceph/{{ cluster }}.mgr.{{ hostvars[item]['ansible_hostname'] }}.keyring
+  with_items: "{{ groups.get(mgr_group_name, []) }}"
+  register: tmp_ceph_mgr_keys_result
+  when: "{{ groups.get(mgr_group_name, []) | length > 0 }}"
+
+- name: convert mgr keys to an array
+  set_fact:
+    ceph_mgr_keys: "{{ tmp_ceph_mgr_keys_result.results | map(attribute='ansible_facts.tmp_ceph_mgr_keys') | list }}"
+  when: "{{ groups.get(mgr_group_name, []) | length > 0 }}"
+
+- name: merge mgr keys to config and keys paths
+  set_fact:
+    ceph_config_keys: "{{ ceph_config_keys + ceph_mgr_keys }}"
+  when: "{{ groups.get(mgr_group_name, []) | length > 0 }}"
+
+- name: stat for ceph config and keys
+  local_action: stat path={{ fetch_directory }}/docker_mon_files/{{ item }}
+  with_items: "{{ ceph_config_keys }}"
+  changed_when: false
+  become: false
+  failed_when: false
+  register: statconfig
+  always_run: true
+
+- name: try to fetch ceph config and keys
+  copy:
+    src: "{{ fetch_directory }}/docker_mon_files/{{ item.0 }}"
+    dest: "{{ item.0 }}"
+    owner: root
+    group: root
+    mode: 0644
+  changed_when: false
+  with_together:
+    - "{{ ceph_config_keys }}"
+    - "{{ statconfig.results }}"
+  when: item.1.stat.exists == true
diff --git a/roles/ceph-docker-common/tasks/fetch_image.yml b/roles/ceph-docker-common/tasks/fetch_image.yml
new file mode 100644 (file)
index 0000000..57c76ed
--- /dev/null
@@ -0,0 +1,26 @@
+---
+# Normal case - pull image from registry
+- name: "pull {{ ceph_docker_image }} image"
+  command: "docker pull {{ ceph_docker_registry}}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
+  changed_when: false
+  when: ceph_docker_dev_image is undefined or not ceph_docker_dev_image
+
+# Dev case - export local dev image and send it across
+- name: export local ceph dev image
+  local_action: command docker save -o "/tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar" "{{ ceph_docker_username }}/{{ ceph_docker_imagename }}:{{ ceph_docker_image_tag }}"
+  when: ceph_docker_dev_image is defined and ceph_docker_dev_image
+  run_once: true
+
+- name: copy ceph dev image file
+  copy:
+    src: "/tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar"
+    dest: "/tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar"
+  when: ceph_docker_dev_image is defined and ceph_docker_dev_image
+
+- name: load ceph dev image
+  command: "docker load -i /tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar"
+  when: ceph_docker_dev_image is defined and ceph_docker_dev_image
+
+- name: remove tmp ceph dev image file
+  command: "rm /tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar"
+  when: ceph_docker_dev_image is defined and ceph_docker_dev_image
index 357573a8bf1aad8f577021f8289c5b484101ae58..d27223fb9e377ec566876f04ac9cd7cc92e40466 100644 (file)
 - set_fact:
     monitor_name: "{{ ansible_fqdn }}"
   when: mon_use_fqdn
+
+- name: check if a cluster is already running
+  command: "docker ps -q -a --filter='ancestor={{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'"
+  register: ceph_health
+  changed_when: false
+  failed_when: false
+  always_run: true
+
+# Only include 'checks.yml' when :
+# we are deploying containers without kv AND host is either a mon OR a nfs OR an osd,
+# AND
+# a cluster is not already running,
+# AND
+# we are not playing rolling-update.yml playbook.
+- include: checks.yml
+  when:
+    - (not containerized_deployment_with_kv and
+       ((inventory_hostname in groups.get(mon_group_name, [])) or
+        (inventory_hostname in groups.get(nfs_group_name, [])) or
+        (inventory_hostname in groups.get(osd_group_name, []))))
+    - ceph_health.rc != 0
+    - not "{{ rolling_update | default(false) }}"
+
+- include: "./misc/ntp_atomic.yml"
+  when:
+    - is_atomic
+    - ansible_os_family == 'RedHat'
+    - ntp_service_enabled
+
+- include: "./misc/ntp_redhat.yml"
+  when:
+    - not is_atomic
+    - ansible_os_family == 'RedHat'
+    - ntp_service_enabled
+
+- include: "./misc/ntp_debian.yml"
+  when:
+    - ansible_os_family == 'Debian'
+    - ntp_service_enabled
+
+- include: "./fetch_image.yml"
+
+# NOTE (jimcurtis): dirs_permissions.yml must precede fetch_configs.yml
+# # because it creates the directories needed by the latter.
+- include: ./dirs_permissions.yml
+
+# let the first mon create configs and keyrings
+# Only include 'create_configs.yml" when:
+# we are not populating kv_store with default ceph.conf AND host is a mon
+# OR
+# we are not population kv_store with default ceph.conf AND there at least 1 nfs in nfs group AND host is the first nfs
+- include: create_configs.yml
+  when:
+    - (not mon_containerized_default_ceph_conf_with_kv and
+        (inventory_hostname in groups.get(mon_group_name, []))) or
+      (not mon_containerized_default_ceph_conf_with_kv and
+        ((groups.get(nfs_group_name, []) | length > 0)
+          and (inventory_hostname == groups.get(nfs_group_name, [])[0])))
+
+# Only include 'fetch_configs.yml' when:
+# - we are deploying containers without kv AND host is either a mon OR a nfs OR an osd
+# OR
+# - host is either a mdss OR mgrs OR rgws
+- include: fetch_configs.yml
+  when:
+    - (not containerized_deployment_with_kv and
+        ((inventory_hostname in groups.get(mon_group_name, [])) or
+          (inventory_hostname in groups.get(nfs_group_name, [])) or
+          (inventory_hostname in groups.get(osd_group_name, [])))) or
+      (inventory_hostname in groups.get('mdss', [])) or
+      (inventory_hostname in groups.get('mgrs', [])) or
+      (inventory_hostname in groups.get('rgws', []))
+
+- include: selinux.yml
diff --git a/roles/ceph-docker-common/tasks/misc/ntp_atomic.yml b/roles/ceph-docker-common/tasks/misc/ntp_atomic.yml
new file mode 100644 (file)
index 0000000..11dfc98
--- /dev/null
@@ -0,0 +1,11 @@
+---
+- include: ../checks/check_ntp_atomic.yml
+  when: is_atomic
+
+- name: start the ntp service
+  service:
+    name: chronyd
+    enabled: yes
+    state: started
+  when:
+    - ntp_pkg_query.rc == 0
diff --git a/roles/ceph-docker-common/tasks/misc/ntp_debian.yml b/roles/ceph-docker-common/tasks/misc/ntp_debian.yml
new file mode 100644 (file)
index 0000000..62db346
--- /dev/null
@@ -0,0 +1,11 @@
+---
+- include: ../checks/check_ntp_debian.yml
+  when: ansible_os_family == 'Debian'
+
+- name: start the ntp service
+  service:
+    name: ntp
+    enabled: yes
+    state: started
+  when:
+    - ntp_pkg_query.rc == 0
diff --git a/roles/ceph-docker-common/tasks/misc/ntp_redhat.yml b/roles/ceph-docker-common/tasks/misc/ntp_redhat.yml
new file mode 100644 (file)
index 0000000..b64b9d8
--- /dev/null
@@ -0,0 +1,11 @@
+---
+- include: ../checks/check_ntp_redhat.yml
+  when: ansible_os_family == 'RedHat'
+
+- name: start the ntp service
+  service:
+    name: ntpd
+    enabled: yes
+    state: started
+  when:
+    - ntp_pkg_query.rc == 0
diff --git a/roles/ceph-docker-common/tasks/selinux.yml b/roles/ceph-docker-common/tasks/selinux.yml
new file mode 100644 (file)
index 0000000..6d4ee02
--- /dev/null
@@ -0,0 +1,14 @@
+---
+- name: check if selinux is enabled
+  command: getenforce
+  register: sestatus
+  changed_when: false
+  always_run: true
+
+- name: set selinux permissions
+  shell: chcon -Rt svirt_sandbox_file_t {{ item }}
+  with_items:
+    - /etc/ceph
+    - /var/lib/ceph
+  changed_when: false
+  when: sestatus.stdout != 'Disabled'
index 71574897e6d7d26c0f4fa61daeca35b399dafc91..ec6dd154b22cc32a364e3a9d02648f07072b72f8 100644 (file)
@@ -13,19 +13,9 @@ fetch_directory: fetch/
 # will copy the admin key to the /etc/ceph/ directory
 copy_admin_key: false
 
-cephx: true
-
-
 ##########
 # DOCKER #
 ##########
 
-mds_containerized_deployment: false
-mds_containerized_deployment_with_kv: false
-kv_type: etcd
-kv_endpoint: 127.0.0.1
-ceph_docker_image: "ceph/daemon"
-ceph_docker_image_tag: latest
 ceph_mds_docker_extra_env: -e CLUSTER={{ cluster }} -e MDS_NAME={{ ansible_hostname }}
-ceph_docker_on_openstack: false
 ceph_config_keys: [] # DON'T TOUCH ME
index dc86bd0f3c9bbb78b4b5e1807452977fb0c06c0f..9b7943261b7989f45023cbdb2e9345ef64693ef6 100644 (file)
@@ -11,5 +11,5 @@ galaxy_info:
   categories:
     - system
 dependencies:
-  - { role: ceph.ceph-common, when: not mds_containerized_deployment }
-  - { role: ceph.ceph-docker-common, when: mds_containerized_deployment }
+  - { role: ceph.ceph-common, when: not containerized_deployment }
+  - { role: ceph.ceph-docker-common, when: containerized_deployment }
diff --git a/roles/ceph-mds/tasks/docker/checks.yml b/roles/ceph-mds/tasks/docker/checks.yml
deleted file mode 100644 (file)
index 968fc03..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- name: set config and keys paths
-  set_fact:
-    ceph_config_keys:
-      - /etc/ceph/{{ cluster }}.client.admin.keyring
-      - /etc/ceph/{{ cluster }}.conf
-      - /etc/ceph/monmap-{{ cluster }}
-      - /etc/ceph/{{ cluster }}.mon.keyring
-      - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
-      - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
-      - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
-
-- name: stat for ceph config and keys
-  stat:
-    path: "{{ item }}"
-  with_items: "{{ ceph_config_keys }}"
-  changed_when: false
-  failed_when: false
-  always_run: true
-  register: statleftover
-
-- name: fail if we find existing cluster files
-  fail:
-    msg: "looks like no cluster is running but ceph files are present, please remove them"
-  with_together:
-    - "{{ ceph_config_keys }}"
-    - "{{ statleftover.results }}"
-  when: item.1.stat.exists == true
index 75a954e219b61c463cb6c624abc7de938294907a..b3cab97adb604a4f34e2fedc2bbc35299c362d7f 100644 (file)
@@ -1,38 +1,2 @@
 ---
-- name: check if a cluster is already running
-  command: "docker ps -q -a --filter='ancestor={{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'"
-  register: ceph_health
-  changed_when: false
-  failed_when: false
-  always_run: true
-
-- include: checks.yml
-  when:
-    - ceph_health.rc != 0
-    - not "{{ rolling_update | default(false) }}"
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_atomic.yml"
-  when:
-    - is_atomic
-    - ansible_os_family == 'RedHat'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_redhat.yml"
-  when:
-    - not is_atomic
-    - ansible_os_family == 'RedHat'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_debian.yml"
-  when:
-    - ansible_os_family == 'Debian'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/docker/fetch_image.yml"
-- include: dirs_permissions.yml
-- include: fetch_configs.yml
-
-- include: selinux.yml
-  when: ansible_os_family == 'RedHat'
-
 - include: start_docker_mds.yml
index f932e584a7e358d07debdea71f857076bbf9b039..1c0b8c6153684d7ec37289581a88cdcc4360ba15 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - include: pre_requisite.yml
-  when: not mds_containerized_deployment
+  when: not containerized_deployment
 
 - include: ./docker/main.yml
-  when: mds_containerized_deployment
+  when: containerized_deployment
index 3ea1a32cb29a4edcc3fe8806083218507bcd8c8a..6c901a7183964b584155ebeda2afd3e64862c15e 100644 (file)
@@ -7,7 +7,7 @@ EnvironmentFile=-/etc/environment
 ExecStartPre=-/usr/bin/docker stop ceph-mds-{{ ansible_hostname }}
 ExecStartPre=-/usr/bin/docker rm ceph-mds-{{ ansible_hostname }}
 ExecStart=/usr/bin/docker run --rm --net=host \
-   {% if not mds_containerized_deployment_with_kv -%}
+   {% if not containerized_deployment_with_kv -%}
    -v /var/lib/ceph:/var/lib/ceph \
    -v /etc/ceph:/etc/ceph \
    {% else -%}
index 11227b781ba3bd41aa0f8cc3ee36dac4bf48beae..73a031797f242056f6096475720f91139b8886d2 100644 (file)
@@ -3,12 +3,5 @@
 # DOCKER #
 ##########
 
-mgr_containerized_deployment: false
-mgr_containerized_deployment_with_kv: false
-kv_type: etcd
-kv_endpoint: 127.0.0.1
-ceph_docker_image: "ceph/daemon"
-ceph_docker_image_tag: latest
 ceph_mgr_docker_extra_env: -e CLUSTER={{ cluster }} -e MGR_NAME={{ ansible_hostname }}
-ceph_docker_on_openstack: false
 ceph_config_keys: [] # DON'T TOUCH ME
index 878df1d1d17fb56564115036144a3784ee4c1203..6829b9ebc8535a2463fc556b68fdcd3da8a794d5 100644 (file)
@@ -14,5 +14,5 @@ galaxy_info:
   categories:
     - system
 dependencies:
-  - { role: ceph.ceph-common, when: not mgr_containerized_deployment }
-  - { role: ceph.ceph-docker-common, when: mgr_containerized_deployment }
+  - { role: ceph.ceph-common, when: not containerized_deployment }
+  - { role: ceph.ceph-docker-common, when: containerized_deployment }
diff --git a/roles/ceph-mgr/tasks/docker/checks.yml b/roles/ceph-mgr/tasks/docker/checks.yml
deleted file mode 100644 (file)
index 968fc03..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- name: set config and keys paths
-  set_fact:
-    ceph_config_keys:
-      - /etc/ceph/{{ cluster }}.client.admin.keyring
-      - /etc/ceph/{{ cluster }}.conf
-      - /etc/ceph/monmap-{{ cluster }}
-      - /etc/ceph/{{ cluster }}.mon.keyring
-      - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
-      - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
-      - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
-
-- name: stat for ceph config and keys
-  stat:
-    path: "{{ item }}"
-  with_items: "{{ ceph_config_keys }}"
-  changed_when: false
-  failed_when: false
-  always_run: true
-  register: statleftover
-
-- name: fail if we find existing cluster files
-  fail:
-    msg: "looks like no cluster is running but ceph files are present, please remove them"
-  with_together:
-    - "{{ ceph_config_keys }}"
-    - "{{ statleftover.results }}"
-  when: item.1.stat.exists == true
index 1a876d5d8b53f0f194113bbcb5fd210ca556f8de..1f72d3635ae8cc4e66dd90df1ad7686a27e397b4 100644 (file)
@@ -1,36 +1,2 @@
 ---
-- name: check if a cluster is already running
-  command: "docker ps -q -a --filter='ancestor={{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'"
-  register: ceph_health
-  changed_when: false
-  failed_when: false
-  always_run: true
-
-- include: checks.yml
-  when: ceph_health.rc != 0
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_atomic.yml"
-  when:
-    - is_atomic
-    - ansible_os_family == 'RedHat'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_redhat.yml"
-  when:
-    - not is_atomic
-    - ansible_os_family == 'RedHat'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_debian.yml"
-  when:
-    - ansible_os_family == 'Debian'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/docker/fetch_image.yml"
-- include: dirs_permissions.yml
-- include: fetch_configs.yml
-
-- include: selinux.yml
-  when: ansible_os_family == 'RedHat'
-
 - include: start_docker_mgr.yml
index 6c31d30cd473b169375d2ee418f59ff518eef50d..1c0b8c6153684d7ec37289581a88cdcc4360ba15 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - include: pre_requisite.yml
-  when: not mgr_containerized_deployment
+  when: not containerized_deployment
 
 - include: ./docker/main.yml
-  when: mgr_containerized_deployment
+  when: containerized_deployment
index cdb4e0de0087d134058e590dc10e432b80a63c7d..02cbd96ebf580c107414053cd7264f37a8a7b5d9 100644 (file)
@@ -7,7 +7,7 @@ EnvironmentFile=-/etc/environment
 ExecStartPre=-/usr/bin/docker stop ceph-mgr-{{ ansible_hostname }}
 ExecStartPre=-/usr/bin/docker rm ceph-mgr-{{ ansible_hostname }}
 ExecStart=/usr/bin/docker run --rm --net=host \
-   {% if not mgr_containerized_deployment_with_kv -%}
+   {% if not containerized_deployment_with_kv -%}
    -v /var/lib/ceph:/var/lib/ceph \
    -v /etc/ceph:/etc/ceph \
    {% else -%}
index 51bbe12c1ca9d5511e92dffb10db2e223c0f0516..36a0374a2323535a38258672eef7377a4a969826 100644 (file)
@@ -12,7 +12,6 @@ mon_group_name: mons
 # ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT
 fsid: "{{ cluster_uuid.stdout }}"
 monitor_secret: "{{ monitor_keyring.stdout }}"
-cephx: true
 
 # CephFS
 cephfs_data: cephfs_data
@@ -70,16 +69,9 @@ openstack_keys:
 # DOCKER #
 ##########
 docker_exec_cmd:
-mon_containerized_deployment: false
-mon_containerized_deployment_with_kv: false
-# This is currently in ceph-common defaults because it is shared with ceph-nfs
-#mon_containerized_default_ceph_conf_with_kv: false
 ceph_mon_docker_interface: "{{ monitor_interface }}"
 ceph_mon_docker_subnet: "{{ public_network }}"# subnet of the ceph_mon_docker_interface
-ceph_docker_image: "ceph/daemon"
-ceph_docker_image_tag: latest
 ceph_mon_docker_extra_env: -e CLUSTER={{ cluster }} -e FSID={{ fsid }} -e MON_NAME={{ monitor_name }}
-ceph_docker_on_openstack: false
 mon_docker_privileged: false
 mon_docker_net_host: true
 ceph_config_keys: [] # DON'T TOUCH ME
index 9dd5c89f53427c259eb4981391a5aab31a4b23dd..0d99a1b3b931ffb8a9d56536ea1ca2e93103d130 100644 (file)
@@ -11,5 +11,5 @@ galaxy_info:
   categories:
     - system
 dependencies:
-  - { role: ceph.ceph-common, when: not mon_containerized_deployment }
-  - { role: ceph.ceph-docker-common, when: mon_containerized_deployment }
+  - { role: ceph.ceph-common, when: not containerized_deployment }
+  - { role: ceph.ceph-docker-common, when: containerized_deployment }
index 5abe03000c3bed62a5749172a053c9ef2a550bb6..d3abe917fcaf922af1f734878f647e2afe321663 100644 (file)
     - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
   when:
     - cephx
-    - inventory_hostname == groups[mon_group_name]|last
+    - "{{ inventory_hostname == groups[mon_group_name] | last }}"
 
 - name: drop in a motd script to report status when logging in
   copy:
diff --git a/roles/ceph-mon/tasks/docker/checks.yml b/roles/ceph-mon/tasks/docker/checks.yml
deleted file mode 100644 (file)
index 75613c0..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- name: set config and keys paths
-  set_fact:
-    ceph_config_keys:
-      - /etc/ceph/{{ cluster }}.client.admin.keyring
-      - /etc/ceph/{{ cluster }}.conf
-      - /etc/ceph/monmap-{{ cluster }}
-      - /etc/ceph/{{ cluster }}.mon.keyring
-      - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
-      - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
-      - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
-
-- name: stat for ceph config and keys
-  stat:
-    path: "{{ item }}"
-  with_items: "{{ ceph_config_keys }}"
-  changed_when: false
-  failed_when: false
-  register: statleftover
-  always_run: true
-
-- name: fail if we find existing cluster files
-  fail:
-    msg: "looks like no cluster is running but ceph files are present, please remove them"
-  with_together:
-    - "{{ ceph_config_keys }}"
-    - "{{ statleftover.results }}"
-  when: item.1.stat.exists == true
diff --git a/roles/ceph-mon/tasks/docker/create_configs.yml b/roles/ceph-mon/tasks/docker/create_configs.yml
deleted file mode 100644 (file)
index 788a2be..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
----
-- name: create a local fetch directory if it does not exist
-  local_action: file path={{ fetch_directory }} state=directory
-  changed_when: false
-  become: false
-  run_once: true
-  when: cephx or generate_fsid
-
-- name: generate cluster uuid
-  local_action: shell python -c 'import uuid; print(str(uuid.uuid4()))' | tee {{ fetch_directory }}/ceph_cluster_uuid.conf
-    creates="{{ fetch_directory }}/ceph_cluster_uuid.conf"
-  register: cluster_uuid
-  become: false
-  when: generate_fsid
-
-- name: read cluster uuid if it already exists
-  local_action: command cat {{ fetch_directory }}/ceph_cluster_uuid.conf
-    removes="{{ fetch_directory }}/ceph_cluster_uuid.conf"
-  changed_when: false
-  register: cluster_uuid
-  always_run: true
-  become: false
-  when: generate_fsid
-
-- name: "generate {{ cluster }}.conf configuration file"
-  action: config_template
-  args:
-    src: "{{ playbook_dir }}/roles/ceph-common/templates/ceph.conf.j2"
-    dest: "/etc/ceph/{{ cluster }}.conf"
-    owner: "root"
-    group: "root"
-    mode: "0644"
-    config_overrides: "{{ ceph_conf_overrides }}"
-    config_type: ini
index daaf152c4bdb341d0df851d8122646bf17658715..fe49404c3af8671f9e1e23af46b95e5d73062f21 100644 (file)
@@ -1,49 +1,4 @@
 ---
-- name: check if a cluster is already running
-  command: "docker ps -q -a --filter='ancestor={{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'"
-  register: ceph_health
-  changed_when: false
-  failed_when: false
-  always_run: true
-
-- include: checks.yml
-  when:
-    - ceph_health.rc != 0
-    - not mon_containerized_deployment_with_kv
-    - not "{{ rolling_update | default(false) }}"
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_atomic.yml"
-  when:
-    - is_atomic
-    - ansible_os_family == 'RedHat'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_redhat.yml"
-  when:
-    - not is_atomic
-    - ansible_os_family == 'RedHat'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_debian.yml"
-  when:
-    - ansible_os_family == 'Debian'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/docker/fetch_image.yml"
-
-- include: dirs_permissions.yml
-
-# let the first mon create configs and keyrings
-- include: create_configs.yml
-  when:
-    - not mon_containerized_default_ceph_conf_with_kv
-
-- include: fetch_configs.yml
-  when: not mon_containerized_deployment_with_kv
-
-- include: selinux.yml
-  when: ansible_os_family == 'RedHat'
-
 - name: set docker_exec_cmd fact
   set_fact:
     docker_exec_cmd: "docker exec ceph-mon-{{ ansible_hostname }}"
   failed_when: false
   when:
     - "{{ inventory_hostname == groups[mon_group_name][0] }}"
-    - not mon_containerized_deployment_with_kv
+    - not containerized_deployment_with_kv
 
 - include: copy_configs.yml
-  when: not mon_containerized_deployment_with_kv
+  when: not containerized_deployment_with_kv
 
 - name: create ceph rest api keyring when mon is containerized
   command: docker exec ceph-mon-{{ ansible_hostname }} ceph --cluster {{ cluster }} auth get-or-create client.restapi osd 'allow *' mon 'allow *' -o /etc/ceph/{{ cluster }}.client.restapi.keyring
   changed_when: false
   when:
     - cephx
-    - mon_containerized_deployment
+    - containerized_deployment
     - groups[restapi_group_name] is defined
     - "{{ inventory_hostname == groups[mon_group_name] | last }}"
-    - not mon_containerized_deployment_with_kv
+    - not containerized_deployment_with_kv
 
 - include: "{{ playbook_dir }}/roles/ceph-mon/tasks/set_osd_pool_default_pg_num.yml"
 
@@ -97,9 +52,9 @@
     changed_when: false
     when:
       - cephx
-      - mon_containerized_deployment
+      - containerized_deployment
       - "{{ groups.get(mgr_group_name, []) | length > 0 }}"
-      - not mon_containerized_deployment_with_kv
+      - not containerized_deployment_with_kv
     with_items: "{{ groups.get(mgr_group_name, []) }}"
 
   - name: stat for ceph mgr key(s)
index fcd8af4b4b61c83012cf7ac87544460bf4e3d277..5a7d770ce959e7331460f0f2204e8c0029df66d8 100644 (file)
@@ -12,7 +12,7 @@
   run_once: true
   when:
     - "{{ inventory_hostname == groups[mon_group_name][0] }}"
-    - mon_containerized_deployment_with_kv
+    - containerized_deployment_with_kv
     - mon_containerized_default_ceph_conf_with_kv
 
 - name: populate kv_store with custom ceph.conf
@@ -30,7 +30,7 @@
   run_once: true
   when:
     - "{{ inventory_hostname == groups[mon_group_name][0] }}"
-    - mon_containerized_deployment_with_kv
+    - containerized_deployment_with_kv
     - not mon_containerized_default_ceph_conf_with_kv
 
 - name: delete populate-kv-store docker
@@ -38,7 +38,7 @@
     name: populate-kv-store
     state: absent
     image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
-  when: mon_containerized_deployment_with_kv
+  when: containerized_deployment_with_kv
 
 - name: generate systemd unit file
   become: true
index 0c6f75ec01640a4288a1e2700aeaed84b8989758..15bae8deb7d1d57ff93750e19afaf1c6db30981f 100644 (file)
@@ -1,18 +1,18 @@
 ---
 - include: deploy_monitors.yml
-  when: not mon_containerized_deployment
+  when: not containerized_deployment
 
 - include: start_monitor.yml
-  when: not mon_containerized_deployment
+  when: not containerized_deployment
 
 - include: ceph_keys.yml
-  when: not mon_containerized_deployment
+  when: not containerized_deployment
   # this avoids the bug mentioned here: https://github.com/ansible/ansible/issues/18206
   static: no
 
 - include: create_mds_filesystems.yml
   when:
-    - not mon_containerized_deployment
+    - not containerized_deployment
     - groups[mds_group_name] is defined
     - "{{ groups[mds_group_name]|length > 0 }}"
     - "{{ inventory_hostname == groups[mon_group_name] | last }}"
 - include: secure_cluster.yml
   when:
     - secure_cluster
-    - not mon_containerized_deployment
+    - not containerized_deployment
 
 - include: ./docker/main.yml
-  when: mon_containerized_deployment
+  when: containerized_deployment
 
 - include: calamari.yml
   when: calamari
index 014046f3e2311f7970a81fab9c2bb4ea5fc27d8e..2a8bb49110e3af9cbc76e99e62f4f9c3d72675f6 100644 (file)
@@ -7,7 +7,7 @@ EnvironmentFile=-/etc/environment
 ExecStartPre=-/usr/bin/docker rm ceph-mon-%i
 ExecStartPre=$(command -v mkdir) -p /etc/ceph /var/lib/ceph/mon
 ExecStart=/usr/bin/docker run --rm --name ceph-mon-%i --net=host \
-   {% if not mon_containerized_deployment_with_kv -%}
+   {% if not containerized_deployment_with_kv -%}
    -v /var/lib/ceph:/var/lib/ceph \
    -v /etc/ceph:/etc/ceph \
    {% else -%}
index 509d38bc1c739675d2618b27be626a0e1f9e7eeb..f31463d5d73d05ec67a2aff455065592a2776e39 100644 (file)
@@ -7,11 +7,6 @@
 
 fetch_directory: fetch/
 
-## Ceph options
-#
-cephx: true
-
-
 #######################
 # Access type options #
 #######################
@@ -73,12 +68,7 @@ ganesha_conf_overrides: {}
 # DOCKER #
 ##########
 
-nfs_containerized_deployment: false
-nfs_containerized_deployment_with_kv: false
-kv_type: etcd
-kv_endpoint: 127.0.0.1
 ceph_docker_image: "ceph/ganesha"
 ceph_docker_image_tag: latest
 #ceph_nfs_docker_extra_env: -e GANESHA_EPOCH={{ ganesha_epoch }}
-ceph_docker_on_openstack: false
 ceph_config_keys: [] # DON'T TOUCH ME
index 4efb5d920382afd230d2345a278b17b86108d9b1..9b30523883194b39690a3f873219987eb2df57ea 100644 (file)
@@ -11,5 +11,5 @@ galaxy_info:
   categories:
     - system
 dependencies:
-  - { role: ceph.ceph-common, when: not nfs_containerized_deployment }
-  - { role: ceph.ceph-docker-common, when: nfs_containerized_deployment }
+  - { role: ceph.ceph-common, when: not containerized_deployment }
+  - { role: ceph.ceph-docker-common, when: containerized_deployment }
diff --git a/roles/ceph-nfs/tasks/docker/checks.yml b/roles/ceph-nfs/tasks/docker/checks.yml
deleted file mode 100644 (file)
index e6d00d0..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: set config and keys paths
-  set_fact:
-    ceph_config_keys:
-      - /etc/ceph/{{ cluster }}.client.admin.keyring
-      - /etc/ceph/{{ cluster }}.conf
-      - /etc/ceph/monmap-{{ cluster }}
-      - /etc/ceph/{{ cluster }}.mon.keyring
-      - /etc/ganesha/ganesha.conf
-
-- name: stat for ceph config and keys
-  stat:
-    path: "{{ item }}"
-  with_items: "{{ ceph_config_keys }}"
-  changed_when: false
-  failed_when: false
-  always_run: true
-  register: statleftover
-
-- name: fail if we find existing cluster files
-  fail:
-    msg: "looks like no cluster is running but ceph files are present, please remove them"
-  with_together:
-    - "{{ ceph_config_keys }}"
-    - "{{ statleftover.results }}"
-  when: item.1.stat.exists == true
diff --git a/roles/ceph-nfs/tasks/docker/create_configs.yml b/roles/ceph-nfs/tasks/docker/create_configs.yml
deleted file mode 100644 (file)
index c30dd7c..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- name: create ganesha conf directory
-  file:
-    path: /etc/ganesha
-    state: directory
-    owner: root
-    group: root
-    mode: 0644
-
-- name: create the nfs rgw user
-  docker:
-    image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
-    name: ceph-rgw-user-{{ ansible_hostname }}
-    hostname: "{{ ansible_hostname }}"
-    expose: "{{ ceph_rgw_civetweb_port }}"
-    ports: "{{ ceph_rgw_civetweb_port }}:{{ ceph_rgw_civetweb_port }}"
-    state: running
-    env: "CEPH_DAEMON=RGW_USER,RGW_USERNAME={{ ceph_nfs_rgw_user }},RGW_USER_ACCESS_KEY={{ ceph_nfs_rgw_access_key }},RGW_USER_SECRET_KEY={{ ceph_nfs_rgw_secret_key }}"
-    volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph"
-  when: nfs_obj_gw
-
-- name: get user create output
-  command: docker logs ceph-rgw-user-{{ ansible_hostname }}
-  always_run: true
-  register: rgwuser
-
-- name: generate ganesha configuration file
-  action: config_template
-  args:
-    src: "{{ playbook_dir }}/roles/ceph-common/templates/ganesha.conf.j2"
-    dest: /etc/ganesha/ganesha.conf
-    owner: "root"
-    group: "root"
-    mode: "0644"
-    config_overrides: "{{ ganesha_conf_overrides }}"
-    config_type: ini
index 314614b3639555de339d6cf7273e85ffd55da074..9a731c46b2c6a4a9eff1c36bdf127508e630be2b 100644 (file)
@@ -1,53 +1,7 @@
 ---
-- name: check if a cluster is already running
-  command: "docker ps -q -a --filter='ancestor={{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'"
-  register: ceph_health
-  changed_when: false
-  failed_when: false
-  always_run: true
-
-- include: checks.yml
-  when:
-    ceph_health.rc != 0 and
-    not mon_containerized_deployment_with_kv
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_atomic.yml"
-  when:
-    - is_atomic
-    - ansible_os_family == 'RedHat'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_redhat.yml"
-  when:
-    - not is_atomic
-    - ansible_os_family == 'RedHat'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_debian.yml"
-  when:
-    - ansible_os_family == 'Debian'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/docker/fetch_image.yml"
-
-- include: dirs_permissions.yml
-
 # Copy Ceph configs to host
 - include: copy_configs.yml
 
-- include: selinux.yml
-  when: ansible_os_family == 'RedHat'
-
-# let the first ganesha create configs and users
-- include: create_configs.yml
-  when:
-    inventory_hostname == groups[nfs_group_name][0] and
-    not mon_containerized_default_ceph_conf_with_kv
-
-# Copy Ganesha configs to host
-- include: fetch_configs.yml
-  when: not mon_containerized_deployment_with_kv
-
 - include: selinux.yml
   when: ansible_os_family == 'RedHat'
 
index 7c2539de3b7bbbc8b44239e2c4ccbf6e213d43ef..1c0b8c6153684d7ec37289581a88cdcc4360ba15 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - include: pre_requisite.yml
-  when: not nfs_containerized_deployment
+  when: not containerized_deployment
 
 - include: ./docker/main.yml
-  when: nfs_containerized_deployment
+  when: containerized_deployment
index 3b228b4794568d3e82befa40108d01478baeb2e3..1b0834ab1b544adf9f431ddfdc260c8ef2ca359c 100644 (file)
@@ -8,7 +8,7 @@ EnvironmentFile=-/etc/environment
 ExecStartPre=-/usr/bin/docker rm ceph-nfs-%i
 ExecStartPre=/usr/bin/mkdir -p /etc/ceph /etc/ganesha /var/lib/nfs/ganesha
 ExecStart=/usr/bin/docker run --rm --net=host \
-   {% if not mon_containerized_deployment_with_kv -%}
+   {% if not containerized_deployment_with_kv -%}
    -v /etc/ceph:/etc/ceph \
    -v /etc/ganesha:/etc/ganesha \
    {% else -%}
index 9d2df9a56420121c835c0c8d46b82272d7f39ac0..2f95ed08ead0c67824e4de47f00f29b978e1cb09 100644 (file)
@@ -52,7 +52,6 @@ osd_crush_location: "\"root={{ ceph_crush_root }} rack={{ ceph_crush_rack }} hos
 
 # ACTIVATE THE FSID VARIABLE FOR NON-VAGRANT DEPLOYMENT
 fsid: "{{ cluster_uuid.stdout }}"
-cephx: true
 
 # Devices to be used as OSDs
 # You can pre-provision disks that are not present yet.
@@ -150,15 +149,7 @@ dmcrypt_dedicated_journal: false
 # DOCKER #
 ##########
 
-osd_containerized_deployment: false
-osd_containerized_deployment_with_kv: false
-kv_type: etcd
-kv_endpoint: 127.0.0.1
-kv_port: 4001
-ceph_docker_image: "ceph/daemon"
-ceph_docker_image_tag: latest
 ceph_config_keys: [] # DON'T TOUCH ME
-ceph_docker_on_openstack: false
 
 # PREPARE DEVICE
 # Make sure you only pass a single device to raw_journal_devices, otherwise this will fail horribly.
index e1d85c157dbcb89ad1511a43e1debb4db46335ea..ef9c436af79995cd4ac76128f04f257dafc24963 100644 (file)
@@ -11,5 +11,5 @@ galaxy_info:
   categories:
     - system
 dependencies:
-  - { role: ceph.ceph-common, when: not osd_containerized_deployment }
-  - { role: ceph.ceph-docker-common, when: osd_containerized_deployment }
+  - { role: ceph.ceph-common, when: not containerized_deployment }
+  - { role: ceph.ceph-docker-common, when: containerized_deployment }
index 5492c0f884786dac8f47e4b942c32fd8857259cf..da8b23b01439aa69b7bfb30a66068b07d97e635f 100644 (file)
@@ -9,7 +9,7 @@
     msg: "cluster_network must be configured. Ceph replication network"
   when:
     - cluster_network == '0.0.0.0/0'
-    - not osd_containerized_deployment
+    - not containerized_deployment
 
 - name: make sure journal_size configured
   debug:
@@ -25,7 +25,7 @@
   when:
     - osd_group_name is defined
     - osd_group_name in group_names
-    - not osd_containerized_deployment
+    - not containerized_deployment
     - not journal_collocation
     - not raw_multi_journal
     - not bluestore
@@ -38,7 +38,7 @@
   when:
     - osd_group_name is defined
     - osd_group_name in group_names
-    - not osd_containerized_deployment
+    - not containerized_deployment
     - (journal_collocation and raw_multi_journal)
       or (journal_collocation and bluestore)
       or (raw_multi_journal and bluestore)
@@ -56,7 +56,7 @@
   when:
     - osd_group_name is defined
     - osd_group_name in group_names
-    - (journal_collocation or osd_containerized_deployment)
+    - (journal_collocation or containerized_deployment)
     - not osd_auto_discovery
     - devices|length == 0
 
@@ -66,7 +66,7 @@
   when:
     - osd_group_name is defined
     - osd_group_name in group_names
-    - not osd_containerized_deployment
+    - not containerized_deployment
     - raw_multi_journal
     - raw_journal_devices|length == 0
       or devices|length == 0
diff --git a/roles/ceph-osd/tasks/docker/checks.yml b/roles/ceph-osd/tasks/docker/checks.yml
deleted file mode 100644 (file)
index 968fc03..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- name: set config and keys paths
-  set_fact:
-    ceph_config_keys:
-      - /etc/ceph/{{ cluster }}.client.admin.keyring
-      - /etc/ceph/{{ cluster }}.conf
-      - /etc/ceph/monmap-{{ cluster }}
-      - /etc/ceph/{{ cluster }}.mon.keyring
-      - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
-      - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
-      - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
-
-- name: stat for ceph config and keys
-  stat:
-    path: "{{ item }}"
-  with_items: "{{ ceph_config_keys }}"
-  changed_when: false
-  failed_when: false
-  always_run: true
-  register: statleftover
-
-- name: fail if we find existing cluster files
-  fail:
-    msg: "looks like no cluster is running but ceph files are present, please remove them"
-  with_together:
-    - "{{ ceph_config_keys }}"
-    - "{{ statleftover.results }}"
-  when: item.1.stat.exists == true
index 23ecd54e3001e5f8499766351bc91e55ab67c3f2..d9bff3ee2202345526998e9384fb7636f3dcf8d0 100644 (file)
@@ -1,44 +1,5 @@
 ---
-- name: check if a cluster is already running
-  command: "docker ps -q -a --filter='ancestor={{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'"
-  register: ceph_health
-  changed_when: false
-  failed_when: false
-  always_run: true
-
-- include: checks.yml
-  when:
-    - ceph_health.rc != 0
-    - not osd_containerized_deployment_with_kv
-    - not "{{ rolling_update | default(false) }}"
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_atomic.yml"
-  when:
-    - is_atomic
-    - ansible_os_family == 'RedHat'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_redhat.yml"
-  when:
-    - not is_atomic
-    - ansible_os_family == 'RedHat'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_debian.yml"
-  when:
-    - ansible_os_family == 'Debian'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/docker/fetch_image.yml"
-
-# NOTE (jimcurtis): dirs_permissions.yml must precede fetch_configs.yml
-# because it creates the directories needed by the latter.
-- include: dirs_permissions.yml
-
 - include: fetch_configs.yml
-  when: not osd_containerized_deployment_with_kv
-
-- include: selinux.yml
-  when: ansible_os_family == 'RedHat'
+  when: not containerized_deployment_with_kv
 
 - include: start_docker_osd.yml
index 3423a94523bbbad4d18115d05ed79027fc6f8f6d..15f47eae4a36548b8dbef0da6a3a123659d8e2fd 100644 (file)
@@ -40,7 +40,7 @@
   when:
     - item.1.get("rc", 0) != 0
     - ceph_osd_docker_prepare_env is defined
-    - not osd_containerized_deployment_with_kv
+    - not containerized_deployment_with_kv
 
 - name: prepare ceph osd disk with kv_store
   shell: |
@@ -65,7 +65,7 @@
   when:
     - item.1.get("rc", 0) != 0
     - ceph_osd_docker_prepare_env is defined
-    - osd_containerized_deployment_with_kv
+    - containerized_deployment_with_kv
 
 - name: generate ceph osd docker run script
   become: true
index 963716a6c3afd03cfe87d5e091182c864044a766..de2e53ef35a32ee0faf729ee4e1afedae212e7cf 100644 (file)
@@ -2,46 +2,46 @@
 - include: check_mandatory_vars.yml
 
 - include: pre_requisite.yml
-  when: not osd_containerized_deployment
+  when: not containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
 - include: ./scenarios/journal_collocation.yml
   when:
     - journal_collocation
-    - not osd_containerized_deployment
+    - not containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
 - include: ./scenarios/raw_multi_journal.yml
   when:
     - raw_multi_journal
-    - not osd_containerized_deployment
+    - not containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
 - include: ./scenarios/bluestore.yml
   when:
     - osd_objectstore == 'bluestore'
-    - not osd_containerized_deployment
+    - not containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
 - include: ./scenarios/dmcrypt-journal-collocation.yml
   when:
     - dmcrypt_journal_collocation
-    - not osd_containerized_deployment
+    - not containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
 - include: ./scenarios/dmcrypt-dedicated-journal.yml
   when:
     - dmcrypt_dedicated_journal
-    - not osd_containerized_deployment
+    - not containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
 - include: ./docker/main.yml
-  when: osd_containerized_deployment
+  when: containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
index bf5ee9b38b09a6b9959775e8016af6d8ee393d17..9fa5d355142e25c4105708e63ccfe66b15e4726e 100644 (file)
@@ -28,7 +28,7 @@ fi
   --security-opt apparmor:unconfined \
   {% endif -%}
   --pid=host \
-  {% if not osd_containerized_deployment_with_kv -%}
+  {% if not containerized_deployment_with_kv -%}
   -v /var/lib/ceph:/var/lib/ceph \
   -v /etc/ceph:/etc/ceph \
   {% else -%}
index 4395c6e03f010c52430f6b6500fdd2c157702775..a362a5e8fa3c0e2f7602dea3c202017c796ab7a9 100644 (file)
@@ -34,11 +34,4 @@ ceph_rbd_mirror_pool: ""
 # DOCKER #
 ##########
 
-rbd_mirror_containerized_deployment: false
-rbd_mirror_containerized_deployment_with_kv: false
-kv_type: etcd
-kv_endpoint: 127.0.0.1
-ceph_docker_image: "ceph/daemon"
-ceph_docker_image_tag: latest
-ceph_docker_on_openstack: false
 ceph_config_keys: [] # DON'T TOUCH ME
index a70fe441854823c09874e1aad919bc5ecfa646ee..a73a1447c29b252038a30adf80d086ed2e77d225 100644 (file)
@@ -14,5 +14,5 @@ galaxy_info:
   categories:
     - system
 dependencies:
-  - { role: ceph.ceph-common, when: not rbd_mirror_containerized_deployment }
-  - { role: ceph.ceph-docker-common, when: rbd_mirror_containerized_deployment }
+  - { role: ceph.ceph-common, when: not containerized_deployment }
+  - { role: ceph.ceph-docker-common, when: containerized_deployment }
diff --git a/roles/ceph-rbd-mirror/tasks/docker/checks.yml b/roles/ceph-rbd-mirror/tasks/docker/checks.yml
deleted file mode 100644 (file)
index 968fc03..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- name: set config and keys paths
-  set_fact:
-    ceph_config_keys:
-      - /etc/ceph/{{ cluster }}.client.admin.keyring
-      - /etc/ceph/{{ cluster }}.conf
-      - /etc/ceph/monmap-{{ cluster }}
-      - /etc/ceph/{{ cluster }}.mon.keyring
-      - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
-      - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
-      - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
-
-- name: stat for ceph config and keys
-  stat:
-    path: "{{ item }}"
-  with_items: "{{ ceph_config_keys }}"
-  changed_when: false
-  failed_when: false
-  always_run: true
-  register: statleftover
-
-- name: fail if we find existing cluster files
-  fail:
-    msg: "looks like no cluster is running but ceph files are present, please remove them"
-  with_together:
-    - "{{ ceph_config_keys }}"
-    - "{{ statleftover.results }}"
-  when: item.1.stat.exists == true
index dbbc87eea4520ed8dd45aebff8b443015898747c..84ebe12e08c092a9628bbe9c3816c3eeef850f20 100644 (file)
@@ -1,36 +1,4 @@
 ---
-- name: check if a cluster is already running
-  command: "docker ps -q -a --filter='ancestor={{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'"
-  register: ceph_health
-  changed_when: false
-  failed_when: false
-  always_run: true
-
-- include: checks.yml
-  when: ceph_health.rc != 0
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_atomic.yml"
-  when:
-    - is_atomic
-    - ansible_os_family == 'RedHat'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_redhat.yml"
-  when:
-    - not is_atomic
-    - ansible_os_family == 'RedHat'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_debian.yml"
-  when:
-    - ansible_os_family == 'Debian'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/docker/fetch_image.yml"
-- include: dirs_permissions.yml
 - include: fetch_configs.yml
 
-- include: selinux.yml
-  when: ansible_os_family == 'RedHat'
-
 - include: start_docker_rbd_mirror.yml
index abb3c5304571163a21c707f0227af485cbe5cdf3..cdad90bfb9c7a5e05178ad637f58751f11678ba9 100644 (file)
@@ -1,14 +1,14 @@
 ---
 - include: pre_requisite.yml
-  when: not rbd_mirror_containerized_deployment
+  when: not containerized_deployment
 
 - include: start_rbd_mirror.yml
-  when: not rbd_mirror_containerized_deployment
+  when: not containerized_deployment
 
 - include: configure_mirroring.yml
   when:
     - ceph_rbd_mirror_configure
-    - not rbd_mirror_containerized_deployment
+    - not containerized_deployment
 
 - include: ./docker/main.yml
-  when: rbd_mirror_containerized_deployment
+  when: containerized_deployment
index fe5ee0bb372289e428c818e5755563f04629ca17..4b6537ba118eed55c62977828a8fccfdc26c5e7c 100644 (file)
@@ -7,7 +7,7 @@ EnvironmentFile=-/etc/environment
 ExecStartPre=-/usr/bin/docker stop ceph-rbd-mirror-{{ ansible_hostname }}
 ExecStartPre=-/usr/bin/docker rm ceph-rbd-mirror-{{ ansible_hostname }}
 ExecStart=/usr/bin/docker run --rm --net=host \
-   {% if not rbd_mirror_containerized_deployment_with_kv -%}
+   {% if not containerized_deployment_with_kv -%}
    -v /etc/ceph:/etc/ceph \
    {% else -%}
    -e KV_TYPE={{kv_type}} \
index 8df5940709cfe0c2d0786f17b797b82b6c3b3ad7..4152ee73018a6da166ac926569f47615c8242fd5 100644 (file)
@@ -10,11 +10,7 @@ fetch_directory: fetch/
 # DOCKER #
 ##########
 
-restapi_containerized_deployment: false
 ceph_restapi_docker_interface: eth0
 ceph_restapi_port: 5000
-ceph_docker_image: "ceph/daemon"
-ceph_docker_image_tag: latest
 ceph_restapi_docker_extra_env: "RESTAPI_IP=0.0.0.0" # comma separated variables
-ceph_docker_on_openstack: false
 ceph_config_keys: [] # DON'T TOUCH ME
index f2a9c28558ce814a30056980bda1d3ccce144f1a..809d979c2bdfa0d8df62bbe3308dccb97858c09b 100644 (file)
@@ -11,5 +11,5 @@ galaxy_info:
   categories:
     - system
 dependencies:
-  - { role: ceph.ceph-common, when: not restapi_containerized_deployment }
-  - { role: ceph.ceph-docker-common, when: restapi_containerized_deployment }
+  - { role: ceph.ceph-common, when: not containerized_deployment }
+  - { role: ceph.ceph-docker-common, when: containerized_deployment }
index c0143f9cc5083ae65a7bf0e2f6b78eb3e36114f9..900cd8d2ad5045f836f96cc86bdd5cbfd1a1656d 100644 (file)
@@ -1,22 +1,3 @@
 ---
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_atomic.yml"
-  when:
-    - is_atomic
-    - ansible_os_family == 'RedHat'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_redhat.yml"
-  when:
-    - not is_atomic
-    - ansible_os_family == 'RedHat'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_debian.yml"
-  when:
-    - ansible_os_family == 'Debian'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/docker/fetch_image.yml"
-- include: dirs_permissions.yml
 - include: fetch_configs.yml
 - include: start_docker_restapi.yml
index 571d4c98d9808ad324a8b2ef96e37fdda509e5a2..e62323e7bef751087a27268fdba9e2cb7dfb81ca 100644 (file)
@@ -1,9 +1,9 @@
 ---
 - include: pre_requisite.yml
-  when: not restapi_containerized_deployment
+  when: not containerized_deployment
 
 - include: start_restapi.yml
-  when: not restapi_containerized_deployment
+  when: not containerized_deployment
 
 - include: ./docker/main.yml
-  when: restapi_containerized_deployment
+  when: containerized_deployment
index 2eb337b756e65b7b3c7637c441476a04362f4c53..7a6ee4fb08099230af00821546a484f9f84bedbf 100644 (file)
@@ -13,10 +13,6 @@ fetch_directory: fetch/
 # will copy the admin key to the /etc/ceph/ directory
 copy_admin_key: false
 
-## Ceph options
-#
-cephx: true
-
 # Multi-site remote pull URL variables
 rgw_pull_port: "{{ radosgw_civetweb_port }}"
 rgw_pull_proto: "http"
@@ -51,14 +47,7 @@ rgw_pull_proto: "http"
 # DOCKER #
 ##########
 
-rgw_containerized_deployment: false
-rgw_containerized_deployment_with_kv: false
-kv_type: etcd
-kv_endpoint: 127.0.0.1
 ceph_rgw_civetweb_port: "{{ radosgw_civetweb_port }}"
-ceph_docker_image: "ceph/daemon"
-ceph_docker_image_tag: latest
 ceph_rgw_docker_extra_env: -e CLUSTER={{ cluster }} -e RGW_CIVETWEB_PORT={{ ceph_rgw_civetweb_port }}
-ceph_docker_on_openstack: false
 ceph_config_keys: [] # DON'T TOUCH ME
 rgw_config_keys: "/" # DON'T TOUCH ME
index 051f5e0ec54b6ef0c4b952a9bd0512600bd26a75..cffb6d934dab14ab2e6030278ace104dfdf2a8f3 100644 (file)
@@ -11,5 +11,5 @@ galaxy_info:
   categories:
     - system
 dependencies:
-  - { role: ceph.ceph-common, when: not rgw_containerized_deployment }
-  - { role: ceph.ceph-docker-common, when: rgw_containerized_deployment }
+  - { role: ceph.ceph-common, when: not containerized_deployment }
+  - { role: ceph.ceph-docker-common, when: containerized_deployment }
diff --git a/roles/ceph-rgw/tasks/docker/checks.yml b/roles/ceph-rgw/tasks/docker/checks.yml
deleted file mode 100644 (file)
index 968fc03..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- name: set config and keys paths
-  set_fact:
-    ceph_config_keys:
-      - /etc/ceph/{{ cluster }}.client.admin.keyring
-      - /etc/ceph/{{ cluster }}.conf
-      - /etc/ceph/monmap-{{ cluster }}
-      - /etc/ceph/{{ cluster }}.mon.keyring
-      - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
-      - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
-      - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
-
-- name: stat for ceph config and keys
-  stat:
-    path: "{{ item }}"
-  with_items: "{{ ceph_config_keys }}"
-  changed_when: false
-  failed_when: false
-  always_run: true
-  register: statleftover
-
-- name: fail if we find existing cluster files
-  fail:
-    msg: "looks like no cluster is running but ceph files are present, please remove them"
-  with_together:
-    - "{{ ceph_config_keys }}"
-    - "{{ statleftover.results }}"
-  when: item.1.stat.exists == true
index 5779e805edb6d2cd9cc5749c7b022c4f364bdd06..8a599aef973c115150abd0fa0a8360ca430e3f05 100644 (file)
@@ -1,42 +1,6 @@
 ---
-- name: check if a cluster is already running
-  command: "docker ps -q -a --filter='ancestor={{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'"
-  register: ceph_health
-  changed_when: false
-  failed_when: false
-  always_run: true
-
-- include: checks.yml
-  when:
-    - ceph_health.rc != 0
-    - not "{{ rolling_update | default(false) }}"
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_atomic.yml"
-  when:
-    - is_atomic
-    - ansible_os_family == 'RedHat'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_redhat.yml"
-  when:
-    - not is_atomic
-    - ansible_os_family == 'RedHat'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/misc/ntp_debian.yml"
-  when:
-    - ansible_os_family == 'Debian'
-    - ntp_service_enabled
-
-- include: "{{ playbook_dir }}/roles/ceph-common/tasks/docker/fetch_image.yml"
-- include: dirs_permissions.yml
-# NOTE (jimcurtis): dirs_permissions.yml must precede fetch_configs.yml
-# because it creates the directories needed by the latter.
 - include: fetch_configs.yml
 
-- include: selinux.yml
-  when: ansible_os_family == 'RedHat'
-
 - include: start_docker_rgw.yml
 
 - include: copy_configs.yml
index 4e0dc5e45160d5b9fa4971ef99fbf954e7e436b3..52fb1dd3cdec2576edbf46118510bc36a0572bf2 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - include: pre_requisite.yml
-  when: not rgw_containerized_deployment
+  when: not containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
@@ -12,7 +12,7 @@
   static: False
 
 - include: start_radosgw.yml
-  when: not rgw_containerized_deployment
+  when: not containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
@@ -30,6 +30,6 @@
   static: False
 
 - include: ./docker/main.yml
-  when: rgw_containerized_deployment
+  when: containerized_deployment
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
index b63c60878aa6a07837cf886db39d1cd897eaab5d..944e994571a1b36ff4495802e461edd2ea4e0d2e 100644 (file)
@@ -7,7 +7,7 @@ EnvironmentFile=-/etc/environment
 ExecStartPre=-/usr/bin/docker stop ceph-rgw-{{ ansible_hostname }}
 ExecStartPre=-/usr/bin/docker rm ceph-rgw-{{ ansible_hostname }}
 ExecStart=/usr/bin/docker run --rm --net=host \
-   {% if not rgw_containerized_deployment_with_kv -%}
+   {% if not containerized_deployment_with_kv -%}
    -v /var/lib/ceph:/var/lib/ceph \
    -v /etc/ceph:/etc/ceph \
    {% else -%}
index d232095b39827003443b6be2f8e04d743e9c2559..3fa4b55bf3ed60fdb8555606fb517be40fb227d7 100644 (file)
@@ -72,13 +72,7 @@ ansible_provision = proc do |ansible|
   # In a production deployment, these should be secret
   if DOCKER then
     ansible.extra_vars = ansible.extra_vars.merge({
-      mon_containerized_deployment: 'true',
-      osd_containerized_deployment: 'true',
-      mds_containerized_deployment: 'true',
-      rgw_containerized_deployment: 'true',
-      nfs_containerized_deployment: 'true',
-      restapi_containerized_deployment: 'true',
-      rbd_mirror_containerized_deployment: 'true',
+      containerized_deployment: 'true',
       ceph_mon_docker_interface: ETH,
       ceph_mon_docker_subnet: "#{PUBLIC_SUBNET}.0/24",
       ceph_osd_docker_devices: settings['disks'],
index 9608fb6eeaf00df37fcf688a664c64a2f8ede41b..e5950afc3eba7020db5c5fecfc31c017c9ec5352 100644 (file)
@@ -4,10 +4,7 @@
 docker: True
 
 ceph_stable: True
-mon_containerized_deployment: True
-osd_containerized_deployment: True
-mds_containerized_deployment: True
-rgw_containerized_deployment: True
+containerized_deployment: True
 cluster: test
 ceph_mon_docker_interface: eth1
 ceph_mon_docker_subnet: "{{ public_network }}"
index d232095b39827003443b6be2f8e04d743e9c2559..761a7b119b36286f01b00fd1522f7f38517b8af5 100644 (file)
@@ -72,13 +72,13 @@ ansible_provision = proc do |ansible|
   # In a production deployment, these should be secret
   if DOCKER then
     ansible.extra_vars = ansible.extra_vars.merge({
-      mon_containerized_deployment: 'true',
-      osd_containerized_deployment: 'true',
-      mds_containerized_deployment: 'true',
-      rgw_containerized_deployment: 'true',
-      nfs_containerized_deployment: 'true',
-      restapi_containerized_deployment: 'true',
-      rbd_mirror_containerized_deployment: 'true',
+      containerized_deployment: 'true',
+      containerized_deployment: 'true',
+      containerized_deployment: 'true',
+      containerized_deployment: 'true',
+      containerized_deployment: 'true',
+      containerized_deployment: 'true',
+      containerized_deployment: 'true',
       ceph_mon_docker_interface: ETH,
       ceph_mon_docker_subnet: "#{PUBLIC_SUBNET}.0/24",
       ceph_osd_docker_devices: settings['disks'],
index a9178552f37222ea3da1b72079e99ae4053748d4..926e92d11948aad2ea13fee57683539c7b481004 100644 (file)
@@ -4,10 +4,7 @@
 docker: True
 
 ceph_stable: True
-mon_containerized_deployment: True
-osd_containerized_deployment: True
-mds_containerized_deployment: True
-rgw_containerized_deployment: True
+containerized_deployment: True
 cluster: ceph
 ceph_mon_docker_interface: eth1
 ceph_mon_docker_subnet: "{{ public_network }}"
index 11ce8af0f1816692aa9cded811ce69f7a25c6dd1..1192f2cd27a56725a78662347fb5a292b3be9472 100644 (file)
@@ -4,11 +4,7 @@
 docker: True
 
 ceph_stable: True
-mon_containerized_deployment: True
-osd_containerized_deployment: True
-mds_containerized_deployment: True
-rgw_containerized_deployment: True
-mgr_containerized_deployment: True
+containerized_deployment: True
 cluster: test
 ceph_mon_docker_interface: eth1
 ceph_mon_docker_subnet: "{{ public_network }}"