opendev/system-config
Code Issues Proposed changes

Merge "Also set the network info for internap ci account"

Browse Source
This commit is contained in:
Jenkins 2016-04-15 18:57:42 +00:00 committed by Gerrit Code Review
commit f549b11d45
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'] %> username: <%= @puppetmaster_clouds['openstackci_internap_username'] %>
password: <%= @puppetmaster_clouds['openstackci_internap_password'] %> password: <%= @puppetmaster_clouds['openstackci_internap_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %> 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: openstackjenkins-internap:
region_name: nyj01 region_name: nyj01
profile: internap 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'] %> username: <%= @puppetmaster_clouds['openstackci_internap_username'] %>
password: <%= @puppetmaster_clouds['openstackci_internap_password'] %> password: <%= @puppetmaster_clouds['openstackci_internap_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %> 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: openstackci-ovh:
regions: regions:
- GRA1 - GRA1