Merge pull request #1988 from ceph/fix_keyrings

docker: fix keyrings copied on all nodes

roles/ceph-docker-common/tasks/create_configs.yml

@@ -1 +0,0 @@
----

roles/ceph-docker-common/tasks/fetch_configs.yml

@@ -1,17 +0,0 @@
----
-- name: include stat_ceph_files.yml
-  include: stat_ceph_files.yml
-
-- name: try to fetch ceph config and keys
-  copy:
-    src: "{{ fetch_directory }}/{{ fsid }}/{{ item.0 }}"
-    dest: "{{ item.0 }}"
-    owner: root
-    group: root
-    mode: 0600
-  changed_when: false
-  with_together:
-    - "{{ ceph_config_keys }}"
-    - "{{ statconfig.results | default([]) }}"
-  when:
-    - item.1.stat.exists == true

roles/ceph-docker-common/tasks/main.yml

@@ -104,9 +104,6 @@
 - name: include dirs_permissions.yml
   include: dirs_permissions.yml
 
-- name: include create_configs.yml
-  include: create_configs.yml
-
 - name: include selinux.yml
   include: selinux.yml
   when:

roles/ceph-mon/tasks/docker/copy_configs.yml

@@ -8,7 +8,6 @@
       - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
       - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
       - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
-      - /var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring
 
 - name: register rbd bootstrap key
   set_fact:

roles/ceph-nfs/tasks/pre_requisite_container.yml

@@ -2,7 +2,6 @@
 - name: set config and keys paths
   set_fact:
     ceph_config_keys:
-      - /etc/ceph/{{ cluster }}.client.admin.keyring
       - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
 
 - name: stat for config and keys

roles/ceph-osd/tasks/copy_configs.yml

@@ -5,7 +5,7 @@
       - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
 
 - name: wait for ceph.conf and keys
-  local_action: wait_for path={{ fetch_directory }}/{{ fsid }}/{{ item.0 }}
+  local_action: wait_for path={{ fetch_directory }}/{{ fsid }}/{{ item }}
   become: false
   with_items: "{{ ceph_config_keys }}"
 
@@ -20,8 +20,8 @@
 
 - name: try to copy ceph config and keys
   copy:
-    src: "{{ fetch_directory }}/{{ fsid }}/{{ item.0 }}"
+    src: "{{ fetch_directory }}/{{ fsid }}/{{ item }}"
-    dest: "{{ item.0 }}"
+    dest: "{{ item }}"
     owner: root
     group: root
     mode: 0644

tests/functional/ubuntu/16.04/cluster/ceph-override.json

@@ -0,0 +1,7 @@
+{
+	"ceph_conf_overrides": {
+		"global": {
+			"osd_pool_default_pg_num": 12
+		}
+	}
+}

tests/functional/ubuntu/16.04/cluster/group_vars/all

@@ -9,7 +9,7 @@ monitor_interface: eth1
 radosgw_interface: eth1
 journal_size: 100
 devices:
-  - '/dev/disk/by-path/pci-0000:00:01.1-ata-1.0'
+  - '/dev/disk/by-path/pci-0000:00:01.1-ata-1'
   - '/dev/sdb'
 dedicated_devices:
   - '/dev/sdc'