diff --git a/labs/scripts/ubuntu/setup_nova_compute.sh b/labs/scripts/ubuntu/setup_nova_compute.sh
index f4fd67a6..894bc163 100755
--- a/labs/scripts/ubuntu/setup_nova_compute.sh
+++ b/labs/scripts/ubuntu/setup_nova_compute.sh
@@ -11,7 +11,7 @@ indicate_current_auto
 
 #------------------------------------------------------------------------------
 # Set up OpenStack Compute (nova) for compute node.
-# http://docs.openstack.org/icehouse/install-guide/install/apt/content/nova-compute.html
+# http://docs.openstack.org/juno/install-guide/install/apt/content/ch_nova.html#nova-compute-install
 #------------------------------------------------------------------------------
 
 echo "Installing nova for compute node."
@@ -23,9 +23,37 @@ echo "Configuring nova for compute node."
 conf=/etc/nova/nova.conf
 echo "Configuring $conf."
 
+# Configure RabbitMQ variables
+iniset_sudo $conf DEFAULT rpc_backend rabbit
+iniset_sudo $conf DEFAULT rabbit_host controller-mgmt
+iniset_sudo $conf DEFAULT rabbit_password "$RABBIT_PASSWORD"
+
 # Configuring [DEFAULT] section
 iniset_sudo $conf DEFAULT auth_strategy keystone
 
+nova_admin_user=$(service_to_user_name nova)
+nova_admin_password=$(service_to_user_password nova)
+
+# Configure [keystone_authtoken] section
+iniset_sudo $conf keystone_authtoken auth_uri http://controller-mgmt:5000
+iniset_sudo $conf keystone_authtoken auth_host controller-mgmt
+iniset_sudo $conf keystone_authtoken auth_port 35357
+iniset_sudo $conf keystone_authtoken auth_protocol http
+iniset_sudo $conf keystone_authtoken admin_tenant_name "$SERVICE_TENANT_NAME"
+iniset_sudo $conf keystone_authtoken admin_user "$nova_admin_user"
+iniset_sudo $conf keystone_authtoken admin_password "$nova_admin_password"
+
+iniset_sudo $conf DEFAULT my_ip "$(hostname_to_ip compute-mgmt)"
+
+iniset_sudo $conf DEFAULT vnc_enabled True
+iniset_sudo $conf DEFAULT vncserver_listen 0.0.0.0
+iniset_sudo $conf DEFAULT vncserver_proxyclient_address compute-mgmt
+iniset_sudo $conf DEFAULT novncproxy_base_url http://"$(hostname_to_ip controller-api)":6080/vnc_auto.html
+
+iniset_sudo $conf DEFAULT glance_host controller-mgmt
+
+iniset_sudo $conf DEFAULT verbose True
+
 function get_database_url {
     local db_user=$(service_to_db_user nova)
     local db_password=$(service_to_db_password nova)
@@ -39,46 +67,21 @@ database_url=$(get_database_url)
 echo "Setting database connection: $database_url."
 iniset_sudo $conf database connection "$database_url"
 
-nova_admin_user=$(service_to_user_name nova)
-nova_admin_password=$(service_to_user_password nova)
-
-# Configure [keystone_authtoken] section
-iniset_sudo $conf keystone_authtoken auth_uri http://controller-mgmt:5000
-iniset_sudo $conf keystone_authtoken auth_host controller-mgmt
-iniset_sudo $conf keystone_authtoken auth_port 35357
-iniset_sudo $conf keystone_authtoken auth_protocol http
-iniset_sudo $conf keystone_authtoken admin_tenant_name "$SERVICE_TENANT_NAME"
-iniset_sudo $conf keystone_authtoken admin_user "$nova_admin_user"
-iniset_sudo $conf keystone_authtoken admin_password "$nova_admin_password"
-
-# Configure RabbitMQ variables
-iniset_sudo $conf DEFAULT rpc_backend rabbit
-iniset_sudo $conf DEFAULT rabbit_host controller-mgmt
-iniset_sudo $conf DEFAULT rabbit_password "$RABBIT_PASSWORD"
-
-# Configure other variables
-iniset_sudo $conf DEFAULT my_ip "$(hostname_to_ip compute-mgmt)"
-iniset_sudo $conf DEFAULT vnc_enabled True
-iniset_sudo $conf DEFAULT vncserver_listen 0.0.0.0
-iniset_sudo $conf DEFAULT vncserver_proxyclient_address compute-mgmt
-iniset_sudo $conf DEFAULT novncproxy_base_url http://"$(hostname_to_ip controller-api)":6080/vnc_auto.html
-iniset_sudo $conf DEFAULT glance_host controller-mgmt
-
 # Configure nova-compute.conf
 conf=/etc/nova/nova-compute.conf
 iniset_sudo $conf libvirt virt_type qemu
 
-# Remove SQLite database created by Ubuntu package for nova.
-sudo rm -v /var/lib/nova/nova.sqlite
-
 echo "Restarting nova services."
 sudo service nova-compute restart
 
+# Remove SQLite database created by Ubuntu package for nova.
+sudo rm -v /var/lib/nova/nova.sqlite
+
 #------------------------------------------------------------------------------
 # Verify the Nova installation on compute node
 #------------------------------------------------------------------------------
 
-echo "Verify nova service status."
+echo "Verifying nova service status."
 # This call needs root privileges for read access to /etc/nova/nova.conf.
 echo "sudo nova-manage service list"
 sudo nova-manage service list