Revert "Remove ovh from clouds.yaml files"

This reverts commit fc88936851.

Change-Id: I0bd6705335f8915cf1e59ffb33c959d634ceedda
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2018-01-03 10:29:00 -05:00
parent fc88936851
commit 7f0e0f17cd
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
2 changed files with 39 additions and 0 deletions

View File

@ -69,6 +69,19 @@ clouds:
networks:
- name: inap-17304-WAN1101
routes_externally: True
openstackci-ovh:
regions:
- GRA1
- SBG1
- BHS1
profile: ovh
# OVH has a weird new ipv6 setup that we can't handle properly
# for now ignore ipv6
force_ipv4: true
auth:
username: <%= @puppetmaster_clouds['openstackci_ovh_username'] %>
password: <%= @puppetmaster_clouds['openstackci_ovh_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_ovh_project_name'] %>
openstackci-rax:
regions:
- DFW
@ -113,6 +126,19 @@ clouds:
username: <%= @puppetmaster_clouds['openstackjenkins_rax_username'] %>
password: <%= @puppetmaster_clouds['openstackjenkins_rax_password'] %>
project_id: <%= @puppetmaster_clouds['openstackjenkins_rax_project_id'] %>
openstackjenkins-ovh:
regions:
- GRA1
- SBG1
- BHS1
profile: ovh
# OVH has a weird new ipv6 setup that we can't handle properly
# for now ignore ipv6
force_ipv4: true
auth:
username: <%= @puppetmaster_clouds['openstackjenkins_ovh_username'] %>
password: <%= @puppetmaster_clouds['openstackjenkins_ovh_password'] %>
project_name: <%= @puppetmaster_clouds['openstackjenkins_ovh_project_name'] %>
openstack-rax:
regions:
- DFW

View File

@ -22,6 +22,19 @@ clouds:
networks:
- name: inap-17301-WAN1102
routes_externally: True
openstackci-ovh:
regions:
- GRA1
- SBG1
- BHS1
profile: ovh
# OVH has a weird new ipv6 setup that we can't handle properly
# for now ignore ipv6
force_ipv4: true
auth:
username: <%= @puppetmaster_clouds['openstackci_ovh_username'] %>
password: <%= @puppetmaster_clouds['openstackci_ovh_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_ovh_project_name'] %>
openstackci-rax:
regions:
- DFW