From: leseb <seb@redhat.com>
Date: Fri, 26 Jun 2015 13:10:50 +0000 (+0200)
Subject: Merge branch 'group_names' of https://github.com/bjne/ceph-ansible into bjne-group_names
X-Git-Tag: v1.0.0~198^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F290%2Fhead;p=ceph-ansible.git

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
---

c3bc5b3e449f3bbe932c929e7062a1f14927b495
diff --cc roles/ceph-common/handlers/main.yml
index 6e98ad90a,859e865fc..220846663
--- a/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 7b6eeed06,de7a1c3e1..98f4e178c
--- a/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 %}