Tweaks to make install run idempotent

roles/glance-controller/tasks/main.yml

@@ -41,7 +41,7 @@
              {{ env_vars }}
              --add-host=nova-controller:{{ hostvars[groups['nova-controller'][0]]['ansible_default_ipv4']['address'] }} \
              --add-host=keystone:{{ hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address'] }} \
-             hpc/openstack-glance /etc/bootstrap.sh
+             {{ docker_image }} /etc/bootstrap.sh
   tags: bootstrap
 
 - name: make sure service is started