Compare commits

..

2 Commits

Author SHA1 Message Date
Egon Rijpkema 598cbeec9d hope retries will work this way. 2018-02-20 15:29:14 +01:00
Egon Rijpkema 20ce7bcfc3 set overlay ip 2018-02-20 15:28:54 +01:00
4 changed files with 10 additions and 8 deletions

12
merlin
View File

@ -1,9 +1,9 @@
[nova-compute]
merlin-managementnode002 physical_interface_mappings=provider:eno3
merlin-managementnode003 physical_interface_mappings=provider:eno3
merlin-node001 physical_interface_mappings=provider:eno3
merlin-node003 physical_interface_mappings=provider:eno3
merlin-node004 physical_interface_mappings=provider:eno3
merlin-managementnode002 physical_interface_mappings=provider:enp5s0f1 overlay_ip=172.23.43.102
merlin-managementnode003 physical_interface_mappings=provider:enp5s0f1 overlay_ip=172.23.43.103
merlin-node001 physical_interface_mappings=provider:enp130s0f1 overlay_ip=172.23.43.1
merlin-node003 physical_interface_mappings=provider:enp130s0f1 overlay_ip=172.23.43.3
merlin-node002 physical_interface_mappings=provider:enp130s0f1 overlay_ip=172.23.43.2
[databases]
merlin-managementnode001
@ -28,7 +28,7 @@ merlin-managementnode001
merlin-managementnode001
[neutron-controller]
merlin-managementnode001 physical_interface_mappings=provider:eno3
merlin-managementnode001 physical_interface_mappings=provider:enp5s0f1 overlay_ip=172.23.43.101
[heat]
merlin-managementnode001

View File

@ -90,6 +90,7 @@
-e "OS_AUTH_URL=http://${KEYSTONE_HOST}:35357/v3"
-e "OS_PASSWORD={{ secrets['OS_PASSWORD'] }}"
{{ docker_image }} bash /etc/bootstrap.sh
register: result
retries: 7
delay: 3
ignore_errors: yes

View File

@ -6,7 +6,7 @@
name: secrets
- set_fact:
docker_image: "registry.webhosting.rug.nl/hpc/openstack-neutron-controller:latest"
docker_image: "registry.webhosting.rug.nl/hpc/openstack-neutron-controller-merlin:latest"
- name: pull docker image
docker_image:
@ -29,6 +29,7 @@
-e "NOVA_CONTROLLER_HOST={{ listen_ip | default(hostvars[groups['nova-controller'][0]]['ansible_default_ipv4']['address']) }}"
-e "NOVA_PLACEMENT_PASSWORD={{ secrets['NOVA_PLACEMENT_PASSWORD'] }}"
-e "NOVA_PLACEMENT_USER=placement"
-e "OVERLAY_IP={{ overlay_ip }}"
-e "OS_PASSWORD={{ secrets['OS_PASSWORD'] }}"
-e "PHYSICAL_INTERFACE_MAPPINGS={{ physical_interface_mappings }}"
-e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}"

View File

@ -7,7 +7,7 @@
tags: vars
- set_fact:
docker_image: registry.webhosting.rug.nl/hpc/openstack-nova-compute:latest
docker_image: registry.webhosting.rug.nl/hpc/openstack-nova-compute-merlin:latest
tags: vars
- name: pull docker image