NFS fixes

- Move mon_containerized_default_ceph_conf_with_kv config from ceph-mon
  to ceph-common defaults as it's used in ceph-nfs
- Update conditional to generate ganesha config when not
  mon_containerized_default_ceph_conf_with_kv
- Revert change to store radosgw keyring using ansible_hostname on
  ansible server so that ceph-nfs can find it
- Update ceph-ceph-nfs0-rgw-user container to use ansible_hostname
  variable

Signed-off-by: Ivan Font <ivan.font@redhat.com>

diff --git a/group_vars/all.sample b/group_vars/all.sample
index c585b840a0b1258c678a0e5fa8944dce2360fc33..88ef3dbf71cd74f377d2ddc3342353a6589ad750 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -351,6 +351,7 @@ dummy:
 # by ceph.conf.j2 template. so it should always be defined
 #mon_containerized_deployment_with_kv: false
 #mon_containerized_deployment: false
+#mon_containerized_default_ceph_conf_with_kv: false
 
 
 ##################

diff --git a/group_vars/mons.sample b/group_vars/mons.sample
index 9e40b98504f50d45cbd9ba613a284eafbda10202..6897349909808835beda62da5b394a8f211bfdc8 100644 (file)
--- a/group_vars/mons.sample
+++ b/group_vars/mons.sample
@@ -72,6 +72,7 @@ dummy:
 
 #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: eth0
 #ceph_mon_docker_subnet: # subnet of the ceph_mon_docker_interface

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 3e4cc259e5376218c2299bfabd6def9d1f357173..b32b252708fd1791b65aff68d342cf0976312867 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -343,6 +343,7 @@ docker: false
 # by ceph.conf.j2 template. so it should always be defined
 mon_containerized_deployment_with_kv: false
 mon_containerized_deployment: false
+mon_containerized_default_ceph_conf_with_kv: false
 
 
 ##################

diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index 2f235ad44b8aa3b848d049ad01deae3165e19b9b..8a7f20ad2595eb850e28350d6d30232de58d5a3d 100644 (file)
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -64,7 +64,8 @@ openstack_keys:
 
 mon_containerized_deployment: false
 mon_containerized_deployment_with_kv: false
-mon_containerized_default_ceph_conf_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: eth0
 #ceph_mon_docker_subnet: # subnet of the ceph_mon_docker_interface
 ceph_mon_docker_username: ceph

diff --git a/roles/ceph-nfs/tasks/docker/create_configs.yml b/roles/ceph-nfs/tasks/docker/create_configs.yml
index 1bbd65733f318d21d87d6d86df395da4c24f8807..8053d4f5f30dd9374060d87233eb00a00f0edcaf 100644 (file)
--- a/roles/ceph-nfs/tasks/docker/create_configs.yml
+++ b/roles/ceph-nfs/tasks/docker/create_configs.yml
@@ -11,6 +11,7 @@
   docker:
     image: "{{ ceph_rgw_docker_username }}/{{ ceph_rgw_docker_imagename }}:{{ ceph_rgw_docker_image_tag }}"
     name: ceph-{{ ansible_hostname }}-rgw-user
+    hostname: "{{ ansible_hostname }}"
     expose: "{{ ceph_rgw_civetweb_port }}"
     ports: "{{ ceph_rgw_civetweb_port }}:{{ ceph_rgw_civetweb_port }}"
     state: running

diff --git a/roles/ceph-nfs/tasks/docker/main.yml b/roles/ceph-nfs/tasks/docker/main.yml
index 2507d11deb6e59eac1580cd492774ecfbd2b113a..ca7732c60438a3e63879ef46eb1f3a4756d2d328 100644 (file)
--- a/roles/ceph-nfs/tasks/docker/main.yml
+++ b/roles/ceph-nfs/tasks/docker/main.yml
@@ -55,7 +55,7 @@
 - include: create_configs.yml
   when:
     inventory_hostname == groups.nfss[0] and
-    mon_containerized_default_ceph_conf_with_kv
+    not mon_containerized_default_ceph_conf_with_kv
 
 # Copy Ganesha configs to host
 - include: fetch_configs.yml

diff --git a/roles/ceph-rgw/tasks/docker/copy_configs.yml b/roles/ceph-rgw/tasks/docker/copy_configs.yml
index 696f783c9f3b3ceab7a800e45ce3c99f12b0d0ad..8e91c2ffe988fa9d1ec29a2c3757aa0393727787 100644 (file)
--- a/roles/ceph-rgw/tasks/docker/copy_configs.yml
+++ b/roles/ceph-rgw/tasks/docker/copy_configs.yml
@@ -25,7 +25,7 @@
 - name: push ceph files to the ansible server
   fetch:
     src: "{{ item.0 }}"
-    dest: "{{ fetch_directory }}/docker_mon_files/var/lib/ceph/radosgw/{{ ansible_hostname }}/keyring"
+    dest: "{{ fetch_directory }}/docker_mon_files/var/lib/ceph/radosgw/keyring"
     flat: yes
   with_together:
     - rgw_config_keys