diff --git a/playbooks/roles/os_aodh/tasks/aodh_service_add.yml b/playbooks/roles/os_aodh/tasks/aodh_service_add.yml index 7e24205d6e..d990e7f6eb 100644 --- a/playbooks/roles/os_aodh/tasks/aodh_service_add.yml +++ b/playbooks/roles/os_aodh/tasks/aodh_service_add.yml @@ -36,7 +36,7 @@ endpoint: "{{ keystone_service_adminurl }}" user_name: "{{ service_user_name }}" tenant_name: "{{ service_tenant_name }}" - role_name: "{{ role_name }}" + role_name: "{{ aodh_role_name }}" password: "{{ aodh_service_password }}" register: add_service when: not aodh_service_in_ldap | bool diff --git a/playbooks/roles/os_aodh/tasks/aodh_service_setup.yml b/playbooks/roles/os_aodh/tasks/aodh_service_setup.yml index b0f0d98132..0cb940a326 100644 --- a/playbooks/roles/os_aodh/tasks/aodh_service_setup.yml +++ b/playbooks/roles/os_aodh/tasks/aodh_service_setup.yml @@ -25,6 +25,5 @@ service_internalurl: "{{ aodh_service_internalurl }}" service_publicurl: "{{ aodh_service_publicurl }}" service_adminurl: "{{ aodh_service_adminurl }}" - role_name: "{{ aodh_role_name }}" tags: - aodh-add-service diff --git a/playbooks/roles/os_ceilometer/tasks/ceilometer_service_add.yml b/playbooks/roles/os_ceilometer/tasks/ceilometer_service_add.yml index 74ce7bbf3a..878e9ce075 100644 --- a/playbooks/roles/os_ceilometer/tasks/ceilometer_service_add.yml +++ b/playbooks/roles/os_ceilometer/tasks/ceilometer_service_add.yml @@ -36,7 +36,7 @@ endpoint: "{{ keystone_service_adminurl }}" user_name: "{{ service_user_name }}" tenant_name: "{{ service_tenant_name }}" - role_name: "{{ role_name }}" + role_name: "{{ ceilometer_role_name }}" password: "{{ ceilometer_service_password }}" register: add_service when: not ceilometer_service_in_ldap | bool diff --git a/playbooks/roles/os_ceilometer/tasks/ceilometer_service_setup.yml b/playbooks/roles/os_ceilometer/tasks/ceilometer_service_setup.yml index 649a2e6df0..c1e8da488c 100644 --- a/playbooks/roles/os_ceilometer/tasks/ceilometer_service_setup.yml +++ b/playbooks/roles/os_ceilometer/tasks/ceilometer_service_setup.yml @@ -25,6 +25,5 @@ service_internalurl: "{{ ceilometer_service_internalurl }}" service_publicurl: "{{ ceilometer_service_publicurl }}" service_adminurl: "{{ ceilometer_service_adminurl }}" - role_name: "{{ ceilometer_role_name }}" tags: - ceilometer-add-service diff --git a/playbooks/roles/os_cinder/tasks/cinder_service_add.yml b/playbooks/roles/os_cinder/tasks/cinder_service_add.yml index a5375ebee6..b8a7b4ddd4 100644 --- a/playbooks/roles/os_cinder/tasks/cinder_service_add.yml +++ b/playbooks/roles/os_cinder/tasks/cinder_service_add.yml @@ -60,7 +60,7 @@ endpoint: "{{ keystone_service_adminurl }}" user_name: "{{ service_user_name }}" tenant_name: "{{ service_tenant_name }}" - role_name: "{{ role_name }}" + role_name: "{{ cinder_service_role_name }}" insecure: "{{ keystone_service_adminuri_insecure }}" register: add_service when: not cinder_service_in_ldap | bool diff --git a/playbooks/roles/os_cinder/tasks/cinder_service_setup.yml b/playbooks/roles/os_cinder/tasks/cinder_service_setup.yml index a004c12f75..3ce7940251 100644 --- a/playbooks/roles/os_cinder/tasks/cinder_service_setup.yml +++ b/playbooks/roles/os_cinder/tasks/cinder_service_setup.yml @@ -25,7 +25,6 @@ service_publicurl: "{{ cinder_service_publicurl }}" service_internalurl: "{{ cinder_service_internalurl }}" service_adminurl: "{{ cinder_service_adminurl }}" - role_name: "{{ cinder_service_role_name }}" tags: - cinder-server @@ -41,6 +40,5 @@ service_publicurl: "{{ cinder_service_v2_publicurl }}" service_internalurl: "{{ cinder_service_v2_internalurl }}" service_adminurl: "{{ cinder_service_v2_adminurl }}" - role_name: "{{ cinder_service_role_name }}" tags: - cinder-server diff --git a/playbooks/roles/os_heat/tasks/heat_service_add.yml b/playbooks/roles/os_heat/tasks/heat_service_add.yml index dfe1266ce9..8851c9fc60 100644 --- a/playbooks/roles/os_heat/tasks/heat_service_add.yml +++ b/playbooks/roles/os_heat/tasks/heat_service_add.yml @@ -60,7 +60,7 @@ endpoint: "{{ keystone_service_adminurl }}" user_name: "{{ service_user_name }}" tenant_name: "{{ service_tenant_name }}" - role_name: "{{ role_name }}" + role_name: "{{ heat_service_role_name }}" insecure: "{{ keystone_service_adminuri_insecure }}" register: add_service when: not heat_service_in_ldap | bool diff --git a/playbooks/roles/os_heat/tasks/heat_service_setup.yml b/playbooks/roles/os_heat/tasks/heat_service_setup.yml index 29b8718c20..ddb36d015d 100644 --- a/playbooks/roles/os_heat/tasks/heat_service_setup.yml +++ b/playbooks/roles/os_heat/tasks/heat_service_setup.yml @@ -25,7 +25,6 @@ service_publicurl: "{{ heat_service_publicurl }}" service_internalurl: "{{ heat_service_internalurl }}" service_adminurl: "{{ heat_service_adminurl }}" - role_name: "{{ heat_service_role_name }}" tags: - heat-api @@ -41,7 +40,6 @@ service_publicurl: "{{ heat_cfn_service_publicurl }}" service_internalurl: "{{ heat_cfn_service_internalurl }}" service_adminurl: "{{ heat_cfn_service_adminurl }}" - role_name: "{{ heat_service_role_name }}" tags: - heat-api - heat-api-cfn diff --git a/playbooks/roles/os_neutron/tasks/neutron_service_add.yml b/playbooks/roles/os_neutron/tasks/neutron_service_add.yml index 1173774481..877049ff1d 100644 --- a/playbooks/roles/os_neutron/tasks/neutron_service_add.yml +++ b/playbooks/roles/os_neutron/tasks/neutron_service_add.yml @@ -60,7 +60,7 @@ endpoint: "{{ keystone_service_adminurl }}" user_name: "{{ service_user_name }}" tenant_name: "{{ service_tenant_name }}" - role_name: "{{ role_name }}" + role_name: "{{ neutron_service_role_name }}" insecure: "{{ keystone_service_adminuri_insecure }}" register: add_service when: not neutron_service_in_ldap | bool diff --git a/playbooks/roles/os_neutron/tasks/neutron_service_setup.yml b/playbooks/roles/os_neutron/tasks/neutron_service_setup.yml index 524bdf0568..f78559795e 100644 --- a/playbooks/roles/os_neutron/tasks/neutron_service_setup.yml +++ b/playbooks/roles/os_neutron/tasks/neutron_service_setup.yml @@ -25,6 +25,5 @@ service_publicurl: "{{ neutron_service_publicurl }}" service_internalurl: "{{ neutron_service_internalurl }}" service_adminurl: "{{ neutron_service_adminurl }}" - role_name: "{{ neutron_service_role_name }}" tags: - neutron-server diff --git a/playbooks/roles/os_nova/tasks/nova_service_add.yml b/playbooks/roles/os_nova/tasks/nova_service_add.yml index 60603fcffc..14a0d16262 100644 --- a/playbooks/roles/os_nova/tasks/nova_service_add.yml +++ b/playbooks/roles/os_nova/tasks/nova_service_add.yml @@ -60,7 +60,7 @@ endpoint: "{{ keystone_service_adminurl }}" user_name: "{{ service_user_name }}" tenant_name: "{{ service_tenant_name }}" - role_name: "{{ role_name }}" + role_name: "{{ nova_service_role_name }}" insecure: "{{ keystone_service_adminuri_insecure }}" register: add_service when: not nova_service_in_ldap | bool diff --git a/playbooks/roles/os_nova/tasks/nova_service_setup.yml b/playbooks/roles/os_nova/tasks/nova_service_setup.yml index 91bef1e012..47529d31a8 100644 --- a/playbooks/roles/os_nova/tasks/nova_service_setup.yml +++ b/playbooks/roles/os_nova/tasks/nova_service_setup.yml @@ -25,6 +25,5 @@ service_publicurl: "{{ nova_service_publicurl }}" service_internalurl: "{{ nova_service_internalurl }}" service_adminurl: "{{ nova_service_adminurl }}" - role_name: "{{ nova_service_role_name }}" tags: - nova-api