opendev/system-config
Code Issues Proposed changes

Also set the network info for internap ci account

Browse Source 
Same as the previous nodepool patch - it's important that we configure
internap correctly in our other clouds.yaml files.

Change-Id: I100fa7f7aa4836579dc8ddcfd40d78402aef38ef
This commit is contained in:
Monty Taylor 2016-04-15 08:13:03 -05:00
parent 84dac6c5cc
commit 16c9274213
No known key found for this signature in database
GPG Key ID: 3390DB68041A12F0
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,11 @@ clouds:
username: <%= @puppetmaster_clouds['openstackci_internap_username'] %>
password: <%= @puppetmaster_clouds['openstackci_internap_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %>
networks:
- name: inap-17301-WAN2344
routes_externally: True
- name: inap-17301-LAN3328
routes_externally: False
openstackjenkins-internap:
region_name: nyj01
profile: internap

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

@ -18,6 +18,11 @@ clouds:
username: <%= @puppetmaster_clouds['openstackci_internap_username'] %>
password: <%= @puppetmaster_clouds['openstackci_internap_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %>
networks:
- name: inap-17301-WAN2344
routes_externally: True
- name: inap-17301-LAN3328
routes_externally: False
openstackci-ovh:
regions:
- GRA1