Rename role name to service name

The original purpose for having an abstract like 'database' rather than
the service name of 'mariadb' has been change. Our direction is different
and this patch reflects consistent naming throughout

Change-Id: I704896191cc5243f9dab2a4cca9120e9dc2ceb2c
Closes-Bug: #1478328

20 files changed, 23 insertions, 24 deletions

diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one
index c79d87eb9..63771f54a 100644
--- a/ansible/inventory/all-in-one
+++ b/ansible/inventory/all-in-one
@@ -15,10 +15,10 @@ localhost       ansible_connection=local
 [haproxy:children]
 support
 
-[database:children]
+[mariadb:children]
 support
 
-[message-broker:children]
+[rabbitmq:children]
 support
 
 [keystone:children]
diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode
index 116f813ff..5806f26f3 100644
--- a/ansible/inventory/multinode
+++ b/ansible/inventory/multinode
@@ -18,10 +18,10 @@ compute01
 [haproxy:children]
 support
 
-[database:children]
+[mariadb:children]
 support
 
-[message-broker:children]
+[rabbitmq:children]
 support
 
 [keystone:children]
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2
index 07fe7aacf..ab866c0bc 100755
--- a/ansible/roles/haproxy/templates/haproxy.cfg.j2
+++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2
@@ -21,7 +21,7 @@ listen mariadb
 
   # TODO(SamYaple): Make DB port configurable throughout Ansible
   bind {{ kolla_internal_address }}:3306
-{% for host in groups['database'] %}
+{% for host in groups['mariadb'] %}
   server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:3306 check inter 2000 rise 2 fall 5 {% if not loop.first %}backup{% endif %}
 
 {% endfor %}
@@ -32,7 +32,7 @@ listen rabbitmq
 
   # TODO(SamYaple): Make rabbitmq port configurable throughout Ansible
   bind {{ kolla_internal_address }}:5672
-{% for host in groups['message-broker'] %}
+{% for host in groups['rabbitmq'] %}
   server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:5672 check inter 2000 rise 2 fall 5
 {% endfor %}
 
diff --git a/ansible/roles/haproxy/templates/keepalived.conf.j2 b/ansible/roles/haproxy/templates/keepalived.conf.j2
index 05062e5bd..e2c37dab5 100644
--- a/ansible/roles/haproxy/templates/keepalived.conf.j2
+++ b/ansible/roles/haproxy/templates/keepalived.conf.j2
@@ -8,7 +8,7 @@ vrrp_instance Floating {
     state MASTER
     interface {{ api_interface }}
     virtual_router_id 51
-    priority {{ groups['database'].index(inventory_hostname) }}
+    priority {{ groups['rabbitmq'].index(inventory_hostname) }}
     advert_int 1
     virtual_ipaddress {
         {{ kolla_internal_address }}
diff --git a/ansible/roles/database/defaults/main.yml b/ansible/roles/mariadb/defaults/main.yml
index 469ad8355..469ad8355 100644
--- a/ansible/roles/database/defaults/main.yml
+++ b/ansible/roles/mariadb/defaults/main.yml
diff --git a/ansible/roles/database/tasks/bootstrap.yml b/ansible/roles/mariadb/tasks/bootstrap.yml
index 5e98c3b26..8eea886d5 100644
--- a/ansible/roles/database/tasks/bootstrap.yml
+++ b/ansible/roles/mariadb/tasks/bootstrap.yml
@@ -57,4 +57,4 @@
       - "{{ node_config_directory }}/mariadb/:/opt/kolla/mariadb/:ro"
     container_volumes_from:
       - "mariadb_data"
-  when: delegate_host == 'None' and inventory_hostname == groups['database'][0]
+  when: delegate_host == 'None' and inventory_hostname == groups['mariadb'][0]
diff --git a/ansible/roles/database/tasks/config.yml b/ansible/roles/mariadb/tasks/config.yml
index ce7ff973e..868ae0524 100644
--- a/ansible/roles/database/tasks/config.yml
+++ b/ansible/roles/mariadb/tasks/config.yml
@@ -3,7 +3,7 @@
   vars:
     service_name: "mariadb"
     config_source:
-      - "roles/database/templates/galera.cnf.j2"
+      - "roles/mariadb/templates/galera.cnf.j2"
     config_template_dest:
       - "{{ node_templates_directory }}/mariadb/galera.cnf_minimal"
     config_dest: "{{ node_config_directory }}/mariadb/galera.cnf"
diff --git a/ansible/roles/database/tasks/main.yml b/ansible/roles/mariadb/tasks/main.yml
index c13e4eb0a..c13e4eb0a 100644
--- a/ansible/roles/database/tasks/main.yml
+++ b/ansible/roles/mariadb/tasks/main.yml
diff --git a/ansible/roles/database/tasks/register.yml b/ansible/roles/mariadb/tasks/register.yml
index c7382ff88..c7382ff88 100644
--- a/ansible/roles/database/tasks/register.yml
+++ b/ansible/roles/mariadb/tasks/register.yml
diff --git a/ansible/roles/database/tasks/start.yml b/ansible/roles/mariadb/tasks/start.yml
index fcddb9e0c..da0a8d379 100644
--- a/ansible/roles/database/tasks/start.yml
+++ b/ansible/roles/mariadb/tasks/start.yml
@@ -9,5 +9,5 @@
       - "{{ node_config_directory }}/mariadb/:/opt/kolla/mariadb/:ro"
     container_volumes_from:
       - "mariadb_data"
-  when: delegate_host != 'None' or (groups['database'] | length) == 1 or
-        ( delegate_host == 'None' and inventory_hostname != groups['database'][0] )
+  when: delegate_host != 'None' or (groups['mariadb'] | length) == 1 or
+        ( delegate_host == 'None' and inventory_hostname != groups['mariadb'][0] )
diff --git a/ansible/roles/database/templates/galera.cnf.j2 b/ansible/roles/mariadb/templates/galera.cnf.j2
index 5f3dbbda0..271d12d7e 100644
--- a/ansible/roles/database/templates/galera.cnf.j2
+++ b/ansible/roles/mariadb/templates/galera.cnf.j2
@@ -8,7 +8,7 @@ query_cache_type=0
 innodb_log_file_size=48M
 
 wsrep_provider=/usr/lib64/galera/libgalera_smm.so
-wsrep_cluster_address=gcomm://{% if (groups['database'] | length) > 1 %}{% for host in groups['database'] %}{{ hostvars[host]['ansible_hostname'] }}{% if not loop.last %},{% endif %}{% endfor %}{% endif %}
+wsrep_cluster_address=gcomm://{% if (groups['mariadb'] | length) > 1 %}{% for host in groups['mariadb'] %}{{ hostvars[host]['ansible_hostname'] }}{% if not loop.last %},{% endif %}{% endfor %}{% endif %}
 
 wsrep_cluster_name="{{ database_cluster_name }}"
 wsrep_node_address={{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
diff --git a/ansible/roles/message-broker/defaults/main.yml b/ansible/roles/rabbitmq/defaults/main.yml
index 67dd88364..67dd88364 100644
--- a/ansible/roles/message-broker/defaults/main.yml
+++ b/ansible/roles/rabbitmq/defaults/main.yml
diff --git a/ansible/roles/message-broker/tasks/bootstrap.yml b/ansible/roles/rabbitmq/tasks/bootstrap.yml
index df974055b..df974055b 100644
--- a/ansible/roles/message-broker/tasks/bootstrap.yml
+++ b/ansible/roles/rabbitmq/tasks/bootstrap.yml
diff --git a/ansible/roles/message-broker/tasks/config.yml b/ansible/roles/rabbitmq/tasks/config.yml
index 8c6caf5e5..21a5f90ca 100644
--- a/ansible/roles/message-broker/tasks/config.yml
+++ b/ansible/roles/rabbitmq/tasks/config.yml
@@ -10,7 +10,7 @@
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
   with_items:
-     - { src: "roles/message-broker/templates/rabbitmq-env.conf.j2",
+     - { src: "rabbitmq-env.conf.j2",
          dest: "{{ node_config_directory }}/rabbitmq/rabbitmq-env.conf" }
-     - { src: "roles/message-broker/templates/rabbitmq.config.j2",
+     - { src: "rabbitmq.config.j2",
          dest: "{{ node_config_directory }}/rabbitmq/rabbitmq.config" }
diff --git a/ansible/roles/message-broker/tasks/main.yml b/ansible/roles/rabbitmq/tasks/main.yml
index 98daa4021..98daa4021 100644
--- a/ansible/roles/message-broker/tasks/main.yml
+++ b/ansible/roles/rabbitmq/tasks/main.yml
diff --git a/ansible/roles/message-broker/tasks/start.yml b/ansible/roles/rabbitmq/tasks/start.yml
index 4a75e0d94..4a75e0d94 100644
--- a/ansible/roles/message-broker/tasks/start.yml
+++ b/ansible/roles/rabbitmq/tasks/start.yml
diff --git a/ansible/roles/message-broker/templates/rabbitmq-env.conf.j2 b/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2
index 555f94dc1..555f94dc1 100644
--- a/ansible/roles/message-broker/templates/rabbitmq-env.conf.j2
+++ b/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2
diff --git a/ansible/roles/message-broker/templates/rabbitmq.config.j2 b/ansible/roles/rabbitmq/templates/rabbitmq.config.j2
index 47ba09e85..787d63ae6 100644
--- a/ansible/roles/message-broker/templates/rabbitmq.config.j2
+++ b/ansible/roles/rabbitmq/templates/rabbitmq.config.j2
@@ -10,7 +10,7 @@
     {default_pass, <<"{{ rabbitmq_password }}">>},
     {cluster_partition_handling, autoheal},
     {cluster_nodes, [
-      {% for host in groups['database'] %}'rabbit@{{ hostvars[host]['ansible_hostname'] }}'{% if not loop.last %},{% endif %}{% endfor %}
+      {% for host in groups['rabbitmq'] %}'rabbit@{{ hostvars[host]['ansible_hostname'] }}'{% if not loop.last %},{% endif %}{% endfor %}
 
     ]}
   ]},
diff --git a/ansible/site.yml b/ansible/site.yml
index 1b708080b..0dd67b69b 100755
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -4,16 +4,15 @@
     - haproxy
   tags: haproxy
 
-- hosts: database
+- hosts: mariadb
   roles:
-    - database
-  tags:
-    - database
+    - mariadb
+  tags: mariadb
 
-- hosts: message-broker
+- hosts: rabbitmq
   roles:
-    - message-broker
-  tags: message-broker
+    - rabbitmq
+  tags: rabbitmq
 
 - hosts: keystone
   roles:
diff --git a/docs/ansible-deployment.md b/docs/ansible-deployment.md
index 402afec4a..6e3e8c914 100644
--- a/docs/ansible-deployment.md
+++ b/docs/ansible-deployment.md
@@ -86,8 +86,8 @@ To run the playbooks for only a particular service, Ansible tags can be used.
 Multiple tags may be specified, and order is still determined by the playbooks.
 
     cd ./kolla/ansible
-    ansible-playbook -i inventory/all-in-one -e @/etc/kolla/defaults.yml -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml site.yml --tags message-broker
-    ansible-playbook -i inventory/all-in-one -e @/etc/kolla/defaults.yml -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml site.yml --tags message-broker,database
+    ansible-playbook -i inventory/all-in-one -e @/etc/kolla/defaults.yml -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml site.yml --tags rabbitmq
+    ansible-playbook -i inventory/all-in-one -e @/etc/kolla/defaults.yml -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml site.yml --tags rabbitmq,mariadb
 
 
 Further Reading