diff --git a/roles/cloud_compute/tasks/main.yml b/roles/cloud_compute/tasks/main.yml
index 8d37b80ef4..aff02a8677 100644
--- a/roles/cloud_compute/tasks/main.yml
+++ b/roles/cloud_compute/tasks/main.yml
@@ -34,7 +34,8 @@
 - command: openstack-config --set /etc/nova/nova.conf keystone_authtoken auth_port 35357
 - command: openstack-config --set /etc/nova/nova.conf keystone_authtoken admin_user nova
 - command: openstack-config --set /etc/nova/nova.conf keystone_authtoken admin_tenant_name service
-- command: openstack-config --set /etc/nova/nova.conf keystone_authtoken admin_password {{NOVA_PASS}}
+- name: set admin_password
+  command: openstack-config --set /etc/nova/nova.conf keystone_authtoken admin_password {{NOVA_PASS}}
 
 - command: openstack-config --set /etc/nova/nova.conf DEFAULT rpc_backend qpid
 - command: openstack-config --set /etc/nova/nova.conf DEFAULT qpid_hostname {{controller_private_ip}}
@@ -68,7 +69,8 @@
 - command: openstack-config --set /etc/neutron/neutron.conf keystone_authtoken auth_port 35357
 - command: openstack-config --set /etc/neutron/neutron.conf keystone_authtoken admin_user neutron
 - command: openstack-config --set /etc/neutron/neutron.conf keystone_authtoken admin_tenant_name service
-- command: openstack-config --set /etc/neutron/neutron.conf keystone_authtoken admin_password {{NEUTRON_PASS}}
+- name: set admin_password
+  command: openstack-config --set /etc/neutron/neutron.conf keystone_authtoken admin_password {{NEUTRON_PASS}}
 
 - command: openstack-config --set /etc/neutron/neutron.conf DEFAULT rpc_backend neutron.openstack.common.rpc.impl_qpid
 - command: openstack-config --set /etc/neutron/neutron.conf DEFAULT qpid_hostname {{controller_private_ip}}
@@ -96,7 +98,8 @@
 - command: openstack-config --set /etc/nova/nova.conf DEFAULT neutron_auth_strategy keystone
 - command: openstack-config --set /etc/nova/nova.conf DEFAULT neutron_admin_tenant_name service
 - command: openstack-config --set /etc/nova/nova.conf DEFAULT neutron_admin_username neutron
-- command: openstack-config --set /etc/nova/nova.conf DEFAULT neutron_admin_password {{NEUTRON_PASS}}
+- name: set neutron_admin_password
+  command: openstack-config --set /etc/nova/nova.conf DEFAULT neutron_admin_password {{NEUTRON_PASS}}
 - command: openstack-config --set /etc/nova/nova.conf DEFAULT neutron_admin_auth_url http://{{controller_private_ip}}:35357/v2.0
 - command: openstack-config --set /etc/nova/nova.conf DEFAULT linuxnet_interface_driver nova.network.linux_net.LinuxOVSInterfaceDriver
 - command: openstack-config --set /etc/nova/nova.conf DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver