Merge branch 'group_names' of https://github.com/bjne/ceph-ansible into bjne-group_names

Signed-off-by: leseb <seb@redhat.com>
Conflicts:
	roles/ceph-common/handlers/main.yml
	roles/ceph-mon/tasks/ceph_keys.yml

diff --cc group_vars/all
Simple merge

diff --cc roles/ceph-common/defaults/main.yml
Simple merge

diff --cc roles/ceph-common/handlers/main.yml
index 6e98ad90a7256111166566b7e89e8859bc03ea7c,859e865fc815d5180f3c69bbdb2e44d3f8b4782f..2208466637048f2c4641ba2e8c41fc0ae1065455
--- 1/roles/ceph-common/handlers/main.yml
--- 2/roles/ceph-common/handlers/main.yml
+++ b/roles/ceph-common/handlers/main.yml
@@@ -4,31 -4,20 +4,31 @@@
  
  - name: restart ceph mons
    command: service ceph restart mon
 -  when: socket.rc == 0 and mon_group_name in group_names
 +  when:
 +    socket.rc == 0 and
-     'mons' in group_names
++    mon_group_name in group_names
  
  - name: restart ceph osds
    command: service ceph restart osd
 -  when: socket.rc == 0 and osd_group_name in group_names
 +  when:
 +    socket.rc == 0 and
-     'osds' in group_names
++    osd_group_name in group_names
  
  - name: restart ceph osds on ubuntu
    command: restart ceph-osd-all
 -  when: socket.rc == 0 and ansible_distribution == 'Ubuntu' and osd_group_name in group_names
 +  when:
 +    socket.rc == 0 and
 +    ansible_distribution == 'Ubuntu' and
-     'osds' in group_names
++    osd_group_name in group_names
  
  - name: restart ceph mdss
    command: service ceph restart mds
 -  when: socket.rc == 0 and mds_group_name in group_names
 +  when:
 +    socket.rc == 0 and
-     'mdss' in group_names
++    mds_group_name in group_names
  
  - name: restart ceph rgws
    command: /etc/init.d/radosgw restart
 -  when: socket.rc == 0 and rgw_group_name in group_names
 +  when:
 +    socket.rc == 0 and
-     'rgws' in group_names
++    rgw_group_name in group_names

diff --cc roles/ceph-common/templates/ceph.conf.j2
index 7b6eeed06ec2c2148bf70ff094ad6853141fdb8d,de7a1c3e1261205416e43cf7882b72ece75cd8a8..98f4e178ce566dd4935bc7ca3c4ab51a36e7d152
--- 1/roles/ceph-common/templates/ceph.conf.j2
--- 2/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@@ -141,9 -135,9 +141,9 @@@
  {% endif %}
  
  {% if radosgw %}
- {% for host in groups['rgws'] %}
+ {% for host in groups[rgw_group_name] %}
  {% if hostvars[host]['ansible_hostname'] is defined %}
 -[client.radosgw.{{ hostvars[host]['ansible_hostname'] }}]
 +[client.rgw.{{ hostvars[host]['ansible_hostname'] }}]
    {% if radosgw_dns_name is defined %}
      rgw dns name = {{ radosgw_dns_name }}
    {% endif %}

diff --cc roles/ceph-mon/defaults/main.yml
Simple merge