refactor: service group names

The uwsgi role assumes that the keys used match the service names
and all of our other services follow this pattern so let's keep
it the same for this.

Change-Id: Id740ff6704bddad306f7470665717dd5c8674e82

defaults/main.yml

@@ -232,28 +232,28 @@ manila_data_init_overrides: {}
 
 ## Service Name-Group Mapping
 manila_services:
-  manila_scheduler:
+  manila-scheduler:
     group: manila_scheduler
     service_name: manila-scheduler
     init_config_overrides: "{{ manila_scheduler_init_overrides }}"
     start_order: 1
     execstarts: "{{ manila_bin }}/manila-scheduler"
     execreloads: "/bin/kill -HUP $MAINPID"
-  manila_share:
+  manila-share:
     group: manila_share
     service_name: manila-share
     init_config_overrides: "{{ manila_share_init_overrides }}"
     start_order: 2
     execstarts: "{{ manila_bin }}/manila-share"
     execreloads: "/bin/kill -HUP $MAINPID"
-  manila_data:
+  manila-data:
     group: manila_share
     service_name: manila-data
     init_config_overrides: "{{ manila_data_init_overrides }}"
     start_order: 3
     execstarts: "{{ manila_bin }}/manila-data"
     execreloads: "/bin/kill -HUP $MAINPID"
-  manila_api:
+  manila-api:
     group: manila_api
     service_name: manila-api
     init_config_overrides: "{{ manila_api_init_overrides }}"

tasks/main.yml

@@ -63,15 +63,15 @@
 
 - import_tasks: manila_lvm_config.yml
   when:
-    - manila_services['manila_share']['group'] in group_names
+    - manila_services['manila-share']['group'] in group_names
     - manila_backend_lvm_inuse | bool
   tags:
     - manila-config
 
 - import_tasks: db_setup.yml
   when:
-    - "manila_services['manila_api']['group'] in group_names"
-    - "inventory_hostname == ((groups[manila_services['manila_api']['group']]| intersect(ansible_play_hosts)) | list)[0]"
+    - "manila_services['manila-api']['group'] in group_names"
+    - "inventory_hostname == ((groups[manila_services['manila-api']['group']]| intersect(ansible_play_hosts)) | list)[0]"
   vars:
     _oslodb_setup_host: "{{ manila_db_setup_host }}"
     _oslodb_databases:
@@ -85,8 +85,8 @@
 
 - include_tasks: mq_setup.yml
   when:
-    - "manila_services['manila_api']['group'] in group_names"
-    - "inventory_hostname == ((groups[manila_services['manila_api']['group']]| intersect(ansible_play_hosts)) | list)[0]"
+    - "manila_services['manila-api']['group'] in group_names"
+    - "inventory_hostname == ((groups[manila_services['manila-api']['group']]| intersect(ansible_play_hosts)) | list)[0]"
   vars:
     _oslomsg_rpc_setup_host: "{{ manila_oslomsg_rpc_setup_host }}"
     _oslomsg_rpc_userid: "{{ manila_oslomsg_rpc_userid }}"
@@ -128,7 +128,7 @@
 - include_tasks: manila_db_sync.yml
   when:
     - groups['manila_api'] | length > 0
-    - manila_services['manila_api']['group'] in group_names
+    - manila_services['manila-api']['group'] in group_names
     - inventory_hostname == ((groups['manila_api'] | intersect(ansible_play_hosts)) | list)[0]
   tags:
     - manila-config
@@ -144,7 +144,7 @@
     openstack_service_system_user: "{{ manila_system_user_name }}"
     openstack_service_venv_bin: "{{ manila_bin }}"
   when:
-    - manila_services['manila_share']['group'] in group_names
+    - manila_services['manila-share']['group'] in group_names
     - manila_backend_rbd_inuse | bool
   tags:
     - ceph
@@ -152,7 +152,7 @@
 - include_tasks: manila_backend_cephfs.yml
   when:
     - (manila_enabled_share_protocols | join('\n')) | regex_search('^ceph.*', multiline=True, ignorecase=True)
-    - manila_services['manila_share']['group'] in group_names
+    - manila_services['manila-share']['group'] in group_names
   with_dict: "{{ _manila_backends | default({}) }}"
   tags:
     - manila-config
@@ -179,7 +179,7 @@
         description: "{{ manila_service_v2_description }}"
   when:
     - groups['manila_api'] | length > 0
-    - manila_services['manila_api']['group'] in group_names
+    - manila_services['manila-api']['group'] in group_names
     - inventory_hostname == ((groups['manila_api'] | intersect(ansible_play_hosts)) | list)[0]
   tags:
     - manila-config
@@ -189,8 +189,8 @@
 
 - include_tasks: manila_backends.yml
   when:
-    - groups[manila_services['manila_share']['group']] | length > 0
-    - manila_services['manila_api']['group'] in group_names
-    - inventory_hostname == ((groups[manila_services['manila_api']['group']] | intersect(ansible_play_hosts)) | list)[-1]
+    - groups[manila_services['manila-share']['group']] | length > 0
+    - manila_services['manila-api']['group'] in group_names
+    - inventory_hostname == ((groups[manila_services['manila-api']['group']] | intersect(ansible_play_hosts)) | list)[-1]
   tags:
     - manila-config

tasks/manila_backends.yml

@@ -34,7 +34,7 @@
 - name: Create singular manila_backends variable for all hosts
   set_fact:
     _manila_backends: "{{ (_manila_backends | default(manila_backends | default({}))) | combine(hostvars[item]['manila_backends'] | default({})) }}"
-  with_items: "{{ groups[manila_services['manila_share']['group']] }}"
+  with_items: "{{ groups[manila_services['manila-share']['group']] }}"
 
 - name: Add in manila devices types
   shell: |

vars/distro_install.yml

@@ -20,16 +20,16 @@
 #
 manila_package_list: |-
   {% set packages = manila_service_distro_packages %}
-  {% if manila_services['manila_share']['group'] in group_names %}
+  {% if manila_services['manila-share']['group'] in group_names %}
   {%   set _ = packages.extend(manila_share_distro_packages) %}
   {%   if manila_backend_lvm_inuse | bool %}
   {%     set _ = packages.extend(manila_lvm_share_distro_packages) %}
   {%   endif %}
   {% endif %}
-  {% if manila_services['manila_api']['group'] in group_names %}
+  {% if manila_services['manila-api']['group'] in group_names %}
   {%   set _ = packages.extend(manila_api_distro_packages) %}
   {% endif %}
-  {% if manila_services['manila_scheduler']['group'] in group_names %}
+  {% if manila_services['manila-scheduler']['group'] in group_names %}
   {%   set _ = packages.extend(manila_scheduler_distro_packages) %}
   {% endif %}
   {% if manila_oslomsg_amqp1_enabled | bool %}

vars/source_install.yml

@@ -20,7 +20,7 @@
 #
 manila_package_list: |-
   {% set packages = manila_distro_packages %}
-  {% if manila_services['manila_share']['group'] in group_names %}
+  {% if manila_services['manila-share']['group'] in group_names %}
   {%   set _ = packages.extend(manila_share_deps_distro_packages) %}
   {%   if manila_backend_lvm_inuse | bool %}
   {%     set _ = packages.extend(manila_lvm_share_distro_packages) %}