Remove hardcoded usernames in register.yml

Usernames can be configured with variables in
configuration files, but user creation is hardcoded.

Change-Id: I057cfb921d776217db66f59226dcfa79f3eb7368
Closes-Bug: #1661587

ansible/roles/aodh/tasks/register.yml

@@ -28,7 +28,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "aodh"
+      user: "{{ aodh_keystone_user }}"
       password: "{{ aodh_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/barbican/tasks/register.yml

@@ -28,7 +28,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "barbican"
+      user: "{{ barbican_keystone_user }}"
       password: "{{ barbican_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/ceilometer/tasks/register.yml

@@ -28,7 +28,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "ceilometer"
+      user: "{{ ceilometer_keystone_user }}"
       password: "{{ ceilometer_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/cinder/tasks/register.yml

@@ -31,7 +31,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "cinder"
+      user: "{{ cinder_keystone_user }}"
       password: "{{ cinder_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/cloudkitty/tasks/register.yml

@@ -28,7 +28,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "cloudkitty"
+      user: "{{ cloudkitty_keystone_user }}"
       password: "{{ cloudkitty_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/designate/tasks/register.yml

@@ -26,7 +26,7 @@
   command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_user
     -a "project=service
-        user=designate
+        user={{ designate_keystone_user }}
         password={{ designate_keystone_password }}
         role=admin
         region_name={{ openstack_region_name }}

ansible/roles/freezer/tasks/register.yml

@@ -28,7 +28,7 @@
     module_name: kolla_keystone_user
     module_args:
       project: service
-      user: freezer
+      user: "{{ freezer_keystone_user }}"
       password: "{{ freezer_keystone_password }}"
       role: admin
       region_name: "{{ openstack_region_name }}"

ansible/roles/glance/tasks/register.yml

@@ -28,7 +28,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "glance"
+      user: "{{ glance_keystone_user }}"
       password: "{{ glance_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/gnocchi/tasks/register.yml

@@ -28,7 +28,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "gnocchi"
+      user: "{{ gnocchi_keystone_user }}"
       password: "{{ gnocchi_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/heat/tasks/register.yml

@@ -31,7 +31,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "heat"
+      user: "{{ heat_keystone_user }}"
       password: "{{ heat_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/karbor/tasks/register.yml

@@ -26,7 +26,7 @@
   command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_user
     -a "project=service
-        user=karbor
+        user={{ karbor_keystone_user }}
         password={{ karbor_keystone_password }}
         role=admin
         region_name={{ openstack_region_name }}

ansible/roles/magnum/tasks/register.yml

@@ -28,7 +28,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "magnum"
+      user: "{{ magnum_keystone_user }}"
       password: "{{ magnum_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/manila/tasks/register.yml

@@ -31,7 +31,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "manila"
+      user: "{{ manila_keystone_user }}"
       password: "{{ manila_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/mistral/tasks/register.yml

@@ -28,7 +28,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "mistral"
+      user: "{{ mistral_keystone_user }}"
       password: "{{ mistral_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/murano/tasks/register.yml

@@ -28,7 +28,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "murano"
+      user: "{{ murano_keystone_user }}"
       password: "{{ murano_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/neutron/tasks/register.yml

@@ -28,7 +28,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "neutron"
+      user: "{{ neutron_keystone_user }}"
       password: "{{ neutron_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/nova/defaults/main.yml

@@ -230,6 +230,8 @@ placement_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{
 
 nova_logging_debug: "{{ openstack_logging_debug }}"
 
+placement_keystone_user: "placement"
+
 openstack_nova_auth: "{{ openstack_auth }}"
 openstack_placement_auth: "{{ openstack_auth }}"
 

ansible/roles/nova/tasks/register.yml

@@ -35,7 +35,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "nova"
+      user: "{{ nova_keystone_user }}"
       password: "{{ nova_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"
@@ -53,7 +53,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "placement"
+      user: "{{ placement_keystone_user }}"
       password: "{{ placement_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/nova/templates/nova.conf.j2

@@ -219,7 +219,7 @@ max_attempts = 10
 [placement]
 auth_type = password
 auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
-username = placement
+username = {{ placement_keystone_user }}
 password = {{ placement_keystone_password }}
 user_domain_name = default
 project_name = service

ansible/roles/octavia/tasks/register.yml

@@ -28,7 +28,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "octavia"
+      user: "{{ octavia_keystone_user }}"
       password: "{{ octavia_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/panko/tasks/register.yml

@@ -26,7 +26,7 @@
   command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_user
     -a "project=service
-        user=panko
+        user={{ panko_keystone_user }}
         password={{ panko_keystone_password }}
         role=admin
         region_name={{ openstack_region_name }}

ansible/roles/sahara/tasks/register.yml

@@ -28,7 +28,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "sahara"
+      user: "{{ sahara_keystone_user }}"
       password: "{{ sahara_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/searchlight/tasks/register.yml

@@ -28,7 +28,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "searchlight"
+      user: "{{ searchlight_keystone_user }}"
       password: "{{ searchlight_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/senlin/tasks/register.yml

@@ -28,7 +28,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "senlin"
+      user: "{{ senlin_keystone_user }}"
       password: "{{ senlin_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/solum/tasks/register.yml

@@ -52,7 +52,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "solum"
+      user: "{{ solum_keystone_user }}"
       password: "{{ solum_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/tacker/tasks/register.yml

@@ -28,7 +28,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "tacker"
+      user: "{{ tacker_keystone_user }}"
       password: "{{ tacker_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/trove/tasks/register.yml

@@ -28,7 +28,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "trove"
+      user: "{{ trove_keystone_user }}"
       password: "{{ trove_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"

ansible/roles/watcher/tasks/register.yml

@@ -28,7 +28,7 @@
     module_name: "kolla_keystone_user"
     module_args:
       project: "service"
-      user: "watcher"
+      user: "{{ watcher_keystone_user }}"
       password: "{{ watcher_keystone_password }}"
       role: "admin"
       region_name: "{{ openstack_region_name }}"