Fix roles

The compute tasks should only apply on compute nodes.
The controller task should only run once - applying only on primary controller
fixes a bug regarding image upload

Change-Id: I1cbf3beb71c56c5054ab765fded69fe8448ccf38

deployment_scripts/controller_post_deployment.sh

@@ -39,6 +39,7 @@ function create_image {
 
 source /root/openrc admin
 
+clear_images
 create_image "TestVM" "xen" "http://ca.downloads.xensource.com/OpenStack/cirros-0.3.4-x86_64-disk.vhd.tgz"
 create_image "F17-x86_64-cfntools" "hvm" "http://ca.downloads.xensource.com/OpenStack/F21-x86_64-cfntools.tgz"
 glance image-list >> $LOG_FILE

tasks.yaml

@@ -1,27 +1,22 @@
-- role: '*'
+- role: ['compute']
   stage: pre_deployment/6000
   type: shell
   parameters:
     cmd: 'dpkg -i ./xe-guest-utilities_6.5.0-1393_amd64.deb'
     timeout: 10
-- role: '*'
+- role: ['compute']
   stage: pre_deployment/6001
   type: shell
   parameters:
     cmd: 'apt-get install sshpass -y'
     timeout: 60
-- role: '*'
-  stage: pre_deployment/7000
-  type: reboot
-  parameters:
-    timeout: 300
 - role: ['compute']
   stage: post_deployment/50
   type: shell
   parameters:
     cmd: ./compute_post_deployment.py
     timeout: 300
-- role: ['primary-controller', 'controller']
+- role: ['primary-controller']
   stage: post_deployment/100
   type: shell
   parameters: