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:
parent
fc88936851
commit
7f0e0f17cd
|
@ -69,6 +69,19 @@ clouds:
|
||||||
networks:
|
networks:
|
||||||
- name: inap-17304-WAN1101
|
- name: inap-17304-WAN1101
|
||||||
routes_externally: True
|
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:
|
openstackci-rax:
|
||||||
regions:
|
regions:
|
||||||
- DFW
|
- DFW
|
||||||
|
@ -113,6 +126,19 @@ clouds:
|
||||||
username: <%= @puppetmaster_clouds['openstackjenkins_rax_username'] %>
|
username: <%= @puppetmaster_clouds['openstackjenkins_rax_username'] %>
|
||||||
password: <%= @puppetmaster_clouds['openstackjenkins_rax_password'] %>
|
password: <%= @puppetmaster_clouds['openstackjenkins_rax_password'] %>
|
||||||
project_id: <%= @puppetmaster_clouds['openstackjenkins_rax_project_id'] %>
|
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:
|
openstack-rax:
|
||||||
regions:
|
regions:
|
||||||
- DFW
|
- DFW
|
||||||
|
|
|
@ -22,6 +22,19 @@ clouds:
|
||||||
networks:
|
networks:
|
||||||
- name: inap-17301-WAN1102
|
- name: inap-17301-WAN1102
|
||||||
routes_externally: True
|
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:
|
openstackci-rax:
|
||||||
regions:
|
regions:
|
||||||
- DFW
|
- DFW
|
||||||
|
|
Loading…
Reference in New Issue