Tweaks to make install run idempotent

roles/keystone/tasks/main.yml

@@ -6,9 +6,12 @@
     state: directory
     mode: 0777
 
-- name: pull keystone image
+- set_fact:
+    docker_image: webhost12.service.rug.nl/hpc/openstack-keystone:latest
+
+- name: pull docker image
   docker_image:
-    name: webhost12.service.rug.nl/hpc/openstack-keystone:latest
+    name: "{{ docker_image }}"
   tags: pull
 
 - name: install service file.
@@ -31,7 +34,7 @@
              --add-host=mariadb:{{ hostvars[groups['databases'][0]]['ansible_default_ipv4']['address'] }}
              -v /srv/keystone/fernet-keys:/etc/keystone/fernet-keys
              -e "KEYSTONE_HOST={{ hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address'] }}"
-             hpc/keystone keystone-manage {{ item }}
+             {{ docker_image }} keystone-manage {{ item }}
   with_items:
       - db_sync
       - fernet_setup --keystone-user keystone --keystone-group keystone
@@ -43,15 +46,15 @@
                     --bootstrap-public-url http://{{ hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address'] }}:5000/v3/
                     --bootstrap-region-id RegionOne
 
+- name: make sure service is started
+  systemd:
+    name: keystone.service
+    state: restarted
+
 - name: Create a domain, projects users and roles
   command: >
              /usr/bin/docker run --rm
              --add-host=mariadb:{{ hostvars[groups['databases'][0]]['ansible_default_ipv4']['address'] }}
              -v /srv/keystone/fernet-keys:/etc/keystone/fernet-keys
              -e "KEYSTONE_HOST={{ hostvars[groups['keystone'][0]]['ansible_default_ipv4']['address'] }}"
-             hpc/keystone bash /etc/bootstrap.sh
-
-- name: make sure service is started
-  systemd:
-    name: keystone.service
-    state: restarted
+             {{ docker_image }} bash /etc/bootstrap.sh