HPC/hpc-cloud
7
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reverting to standard docker images

Browse Source
This commit is contained in:
Egon Rijpkema committed 2018-07-19 16:35:07 +02:00
1 parent c49db46a4d
commit 3083a84b19
4 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

roles/cinder-storage/tasks/main.yml
+1 -1
View File
@@ -10,7 +10,7 @@
# register: uuid # register: uuid
- set_fact: - set_fact:
docker_image: registry.webhosting.rug.nl/hpc/openstack-cinder-storage-merlin:latest docker_image: registry.webhosting.rug.nl/hpc/openstack-cinder-storage:latest
env_vars: > env_vars: >
-e "MY_IP={{ listen_ip | default(ansible_default_ipv4.address) }}" -e "MY_IP={{ listen_ip | default(ansible_default_ipv4.address) }}"
-e "CINDER_HOST={{ listen_ip | default(hostvars[groups['cinder-storage'][0]]['ansible_default_ipv4']['address']) }}" -e "CINDER_HOST={{ listen_ip | default(hostvars[groups['cinder-storage'][0]]['ansible_default_ipv4']['address']) }}"
roles/glance-controller/tasks/main.yml
+1 -1
View File
@@ -6,7 +6,7 @@
name: secrets name: secrets
- set_fact: - set_fact:
docker_image: registry.webhosting.rug.nl/hpc/openstack-glance-merlin:latest docker_image: registry.webhosting.rug.nl/hpc/openstack-glance:latest
env_vars: > env_vars: >
-e "GLANCE_HOST={{ listen_ip | default(hostvars[groups['glance-controller'][0]]['ansible_default_ipv4']['address']) }}" -e "GLANCE_HOST={{ listen_ip | default(hostvars[groups['glance-controller'][0]]['ansible_default_ipv4']['address']) }}"
-e "GLANCE_PASSWORD={{ secrets['GLANCE_PASSWORD'] }}" -e "GLANCE_PASSWORD={{ secrets['GLANCE_PASSWORD'] }}"
roles/neutron-controller/tasks/main.yml
+1 -1
View File
@@ -6,7 +6,7 @@
name: secrets name: secrets
- set_fact: - set_fact:
docker_image: "registry.webhosting.rug.nl/hpc/openstack-neutron-controller-merlin:latest" docker_image: "registry.webhosting.rug.nl/hpc/openstack-neutron-controller:latest"
- name: pull docker image - name: pull docker image
docker_image: docker_image:
roles/nova-compute/tasks/main.yml
+1 -1
View File
@@ -7,7 +7,7 @@
tags: vars tags: vars
- set_fact: - set_fact:
docker_image: registry.webhosting.rug.nl/hpc/openstack-nova-compute-merlin:latest docker_image: registry.webhosting.rug.nl/hpc/openstack-nova-compute:latest
tags: vars tags: vars
- name: pull docker image - name: pull docker image