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

Compare commits

base: HPC:1bbf1e42708f60fe456bf91ae7d39baa9014f8fe
Branches Tags
HPC:master
HPC:develop
HPC:merlin
HPC:feature/add-variables
HPC:merlin-develop
HPC:feature/galera
HPC:feature/cinder-volume-encryption
HPC:umcg-0.2
HPC:umcg-0.1
..
compare: HPC:598cbeec9dbaf8a664f0f079bbff76a6d94c8978
Branches Tags
HPC:develop
HPC:merlin
HPC:master
HPC:feature/add-variables
HPC:merlin-develop
HPC:feature/galera
HPC:feature/cinder-volume-encryption
HPC:umcg-0.2
HPC:umcg-0.1

2 Commits
1bbf1e4270 ... 598cbeec9d

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
Show Stats Expand all files Collapse all files

12
merlin
View File

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

1
roles/keystone/tasks/main.yml
View File

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

3
roles/neutron-controller/tasks/main.yml
View File

@ -6,7 +6,7 @@
name: secrets name: secrets
- set_fact: - 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 - name: pull docker image
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_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_PASSWORD={{ secrets['NOVA_PLACEMENT_PASSWORD'] }}"
-e "NOVA_PLACEMENT_USER=placement" -e "NOVA_PLACEMENT_USER=placement"
-e "OVERLAY_IP={{ overlay_ip }}"
-e "OS_PASSWORD={{ secrets['OS_PASSWORD'] }}" -e "OS_PASSWORD={{ secrets['OS_PASSWORD'] }}"
-e "PHYSICAL_INTERFACE_MAPPINGS={{ physical_interface_mappings }}" -e "PHYSICAL_INTERFACE_MAPPINGS={{ physical_interface_mappings }}"
-e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}" -e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}"

2
roles/nova-compute/tasks/main.yml
View File

@ -7,7 +7,7 @@
tags: vars tags: vars
- set_fact: - 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 tags: vars
- name: pull docker image - name: pull docker image