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

group_vars/all

@@ -8,6 +8,11 @@ dummy:
 # INSTALL
 #########
 
+#mon_group_name: mons
+#osd_group_name: osds
+#rgw_group_name: rgws
+#mds_group_name: mdss
+
 # /!\ EITHER ACTIVE ceph_stable OR ceph_stable_ice OR ceph_dev /!\
 
 # STABLE

roles/ceph-common/defaults/main.yml

@@ -5,6 +5,11 @@
 # INSTALL #
 ###########
 
+mon_group_name: mons
+osd_group_name: osds
+rgw_group_name: rgws
+mds_group_name: mdss
+
 # /!\ EITHER ACTIVE ceph_stable OR ceph_stable_ice OR ceph_dev /!\
 
 # STABLE

roles/ceph-common/handlers/main.yml

@@ -6,29 +6,29 @@
   command: service ceph restart mon
   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
-    '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
-    'osds' in group_names
+    osd_group_name in group_names
 
 - name: restart ceph mdss
   command: service ceph restart mds
   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
-    'rgws' in group_names
+    rgw_group_name in group_names

roles/ceph-common/templates/ceph.conf.j2

@@ -76,7 +76,7 @@
   debug paxos = {{ debug_mon_level }}
   debug auth = {{ debug_mon_level }}
 {% endif %}
-{% for host in groups['mons'] %}
+{% for host in groups[mon_group_name] %}
   {% if hostvars[host]['ansible_hostname'] is defined %}
   [mon.{{ hostvars[host]['ansible_hostname'] }}]
     host = {{ hostvars[host]['ansible_hostname'] }}
@@ -132,7 +132,7 @@
   debug mds log = {{ debug_mds_level }}
   debug mds migrator = {{ debug_mds_level }}
 {% endif %}
-{% for host in groups['mdss'] %}
+{% for host in groups[mds_group_name] %}
   {% if hostvars[host]['ansible_hostname'] is defined %}
   [mds.{{ hostvars[host]['ansible_hostname'] }}]
     host = {{ hostvars[host]['ansible_hostname'] }}
@@ -141,7 +141,7 @@
 {% endif %}
 
 {% if radosgw %}
-{% for host in groups['rgws'] %}
+{% for host in groups[rgw_group_name] %}
 {% if hostvars[host]['ansible_hostname'] is defined %}
 [client.rgw.{{ hostvars[host]['ansible_hostname'] }}]
   {% if radosgw_dns_name is defined %}

roles/ceph-mon/defaults/main.yml

@@ -5,6 +5,8 @@
 # GENERAL #
 ###########
 
+rgw_group_name: rgws
+
 # ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT
 fsid: "{{ cluster_uuid.stdout }}"
 # monitor_secret:

roles/haproxy/defaults/main.yml

@@ -1,5 +1,7 @@
 ---
 # You can override vars by using host or group vars
 
+rgw_group_name: rgws
+
 # Rados Gateway options
 radosgw_interface: eth1 # the public interface which the radosgw talks to the world with, this variable is used in the haproxy role, this does not need to be set if haproxy is not used.

roles/haproxy/templates/precise/haproxy.cfg

@@ -45,7 +45,7 @@ backend rgw
     mode http
     balance roundrobin
     cookie RADOSGWLB insert indirect nocache
-{% for host in groups['rgws'] %}
+{% for host in groups[rgw_group_name] %}
     server {{ hostvars[host].ansible_hostname }} {{ hostvars[host]['ansible_' + radosgw_interface ].ipv4.address }}:80 check cookie {{ hostvars[host].ansible_hostname }}
 {% endfor %}