opendev/system-config
Code Issues Proposed changes

Merge "Adding SJC1 for VEXXHOST"

Browse Source
This commit is contained in:
Zuul
2018-08-27 16:22:48 +00:00
committed by Gerrit Code Review
parent 973b624427 1534c42409
commit 74895df154
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openstack_project/templates/nodepool/clouds.yaml.erb
View File

@@ -43,8 +43,10 @@ clouds:
- name: inap-17304-WAN1101 - name: inap-17304-WAN1101
routes_externally: True routes_externally: True
vexxhost: vexxhost:
region_name: ca-ymq-1
profile: vexxhost profile: vexxhost
regions:
- ca-ymq-1
- sjc1
api_timeout: 60 api_timeout: 60
auth_type: password auth_type: password
auth: auth:

8
modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
View File

@@ -70,7 +70,9 @@ clouds:
password: <%= @puppetmaster_clouds['openstackjenkins_ovh_password'] %> password: <%= @puppetmaster_clouds['openstackjenkins_ovh_password'] %>
project_name: <%= @puppetmaster_clouds['openstackjenkins_ovh_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackjenkins_ovh_project_name'] %>
openstackjenkins-vexxhost: openstackjenkins-vexxhost:
region_name: ca-ymq-1 regions:
- ca-ymq-1
- sjc1
profile: vexxhost profile: vexxhost
auth: auth:
username: '<%= @puppetmaster_clouds['openstackjenkins_vexxhost_username'] %>' username: '<%= @puppetmaster_clouds['openstackjenkins_vexxhost_username'] %>'
@@ -79,7 +81,9 @@ clouds:
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
openstackci-vexxhost: openstackci-vexxhost:
region_name: ca-ymq-1 regions:
- ca-ymq-1
- sjc1
profile: vexxhost profile: vexxhost
auth: auth:
username: '<%= @puppetmaster_clouds['openstackci_vexxhost_username'] %>' username: '<%= @puppetmaster_clouds['openstackci_vexxhost_username'] %>'

4
modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
View File

@@ -46,7 +46,9 @@ clouds:
password: <%= @puppetmaster_clouds['openstackci_rax_password'] %> password: <%= @puppetmaster_clouds['openstackci_rax_password'] %>
project_id: <%= @puppetmaster_clouds['openstackci_rax_project_id'] %> project_id: <%= @puppetmaster_clouds['openstackci_rax_project_id'] %>
openstackci-vexxhost: openstackci-vexxhost:
region_name: ca-ymq-1 regions:
- ca-ymq-1
- sjc1
profile: vexxhost profile: vexxhost
auth: auth:
username: '<%= @puppetmaster_clouds['openstackci_vexxhost_username'] %>' username: '<%= @puppetmaster_clouds['openstackci_vexxhost_username'] %>'