diff --git a/ansible/roles/aodh/tasks/register.yml b/ansible/roles/aodh/tasks/register.yml index bc58bf63a9..3ffc95c578 100644 --- a/ansible/roles/aodh/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/barbican/tasks/register.yml b/ansible/roles/barbican/tasks/register.yml index 50d6272acd..69024333d1 100644 --- a/ansible/roles/barbican/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/ceilometer/tasks/register.yml b/ansible/roles/ceilometer/tasks/register.yml index a46bd55291..87ba09d075 100644 --- a/ansible/roles/ceilometer/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/cinder/tasks/register.yml b/ansible/roles/cinder/tasks/register.yml index 60b613f82b..b3b2f33fb4 100644 --- a/ansible/roles/cinder/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/cloudkitty/tasks/register.yml b/ansible/roles/cloudkitty/tasks/register.yml index 8517f69b4d..f7f340bdba 100644 --- a/ansible/roles/cloudkitty/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/designate/tasks/register.yml b/ansible/roles/designate/tasks/register.yml index e17db9bc27..6d067d7fef 100644 --- a/ansible/roles/designate/tasks/register.yml +++ b/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 }} diff --git a/ansible/roles/freezer/tasks/register.yml b/ansible/roles/freezer/tasks/register.yml index d4512b5eb9..d6646e1bf3 100644 --- a/ansible/roles/freezer/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/glance/tasks/register.yml b/ansible/roles/glance/tasks/register.yml index a0f3a47f07..4d05145814 100644 --- a/ansible/roles/glance/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/gnocchi/tasks/register.yml b/ansible/roles/gnocchi/tasks/register.yml index 3a1a9b9fb4..a50f3a4d5d 100644 --- a/ansible/roles/gnocchi/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/heat/tasks/register.yml b/ansible/roles/heat/tasks/register.yml index a6e9f286f5..3c93203f30 100644 --- a/ansible/roles/heat/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/karbor/tasks/register.yml b/ansible/roles/karbor/tasks/register.yml index 6ee562a605..afe8b376f4 100644 --- a/ansible/roles/karbor/tasks/register.yml +++ b/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 }} diff --git a/ansible/roles/magnum/tasks/register.yml b/ansible/roles/magnum/tasks/register.yml index 3f9b2fc7f1..dee7a41753 100644 --- a/ansible/roles/magnum/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/manila/tasks/register.yml b/ansible/roles/manila/tasks/register.yml index 9e75ec41bd..7c109819f6 100644 --- a/ansible/roles/manila/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/mistral/tasks/register.yml b/ansible/roles/mistral/tasks/register.yml index 8af6faaffe..0ae6911c96 100644 --- a/ansible/roles/mistral/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/murano/tasks/register.yml b/ansible/roles/murano/tasks/register.yml index 79b08c46af..cd3c028b7e 100644 --- a/ansible/roles/murano/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/neutron/tasks/register.yml b/ansible/roles/neutron/tasks/register.yml index 810e48ad42..9903b7c6f4 100644 --- a/ansible/roles/neutron/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml index 93a3970f07..9bef246503 100644 --- a/ansible/roles/nova/defaults/main.yml +++ b/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 }}" diff --git a/ansible/roles/nova/tasks/register.yml b/ansible/roles/nova/tasks/register.yml index fe72bc877d..ff61bc1df9 100644 --- a/ansible/roles/nova/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index f593180b7b..473cf5baf6 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/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 diff --git a/ansible/roles/octavia/tasks/register.yml b/ansible/roles/octavia/tasks/register.yml index 860ae7805c..21b391cf95 100644 --- a/ansible/roles/octavia/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/panko/tasks/register.yml b/ansible/roles/panko/tasks/register.yml index 34b14a47be..dd6280fd23 100644 --- a/ansible/roles/panko/tasks/register.yml +++ b/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 }} diff --git a/ansible/roles/sahara/tasks/register.yml b/ansible/roles/sahara/tasks/register.yml index 43b86a9129..cdb80bc8a2 100644 --- a/ansible/roles/sahara/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/searchlight/tasks/register.yml b/ansible/roles/searchlight/tasks/register.yml index 8279c7ab40..bd656ab92a 100644 --- a/ansible/roles/searchlight/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/senlin/tasks/register.yml b/ansible/roles/senlin/tasks/register.yml index cdfb5152f6..f308727c1a 100644 --- a/ansible/roles/senlin/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/solum/tasks/register.yml b/ansible/roles/solum/tasks/register.yml index 7f12cc0a0b..1f7ab49bd7 100644 --- a/ansible/roles/solum/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/tacker/tasks/register.yml b/ansible/roles/tacker/tasks/register.yml index 7b1fb3a0ce..bf11ef5536 100644 --- a/ansible/roles/tacker/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/trove/tasks/register.yml b/ansible/roles/trove/tasks/register.yml index 21c93d8d1f..635adb5d86 100644 --- a/ansible/roles/trove/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/watcher/tasks/register.yml b/ansible/roles/watcher/tasks/register.yml index a60a6add50..85f5ad7157 100644 --- a/ansible/roles/watcher/tasks/register.yml +++ b/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 }}"