opendev/system-config
Code Issues Proposed changes

Merge "Add mtl01 region to internap on puppetmaster"

Browse Source
This commit is contained in:
Jenkins 2016-08-25 21:41:07 +00:00 committed by Gerrit Code Review
commit 44e6cdb7be
2 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,24 +56,43 @@ clouds:
identity_api_version: '3'
cacert: /etc/ssl/certs/ca-certificates.crt
openstackci-internap:
region_name: nyj01
profile: internap
auth:
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
regions:
- name: mtl01
values:
networks:
- name: inap-17301-WAN1102
routes_externally: True
- name: nyj01
values:
networks:
- name: inap-17301-WAN2344
routes_externally: True
- name: inap-17301-LAN3328
routes_externally: False
openstackjenkins-internap:
region_name: nyj01
profile: internap
auth:
username: <%= @puppetmaster_clouds['openstackjenkins_internap_username'] %>
password: <%= @puppetmaster_clouds['openstackjenkins_internap_password'] %>
project_name: <%= @puppetmaster_clouds['openstackjenkins_internap_project_name'] %>
regions:
- name: mtl01
values:
networks:
- name: inap-17304-WAN1101
routes_externally: True
- name: nyj01
values:
networks:
- name: inap-17304-WAN2342
routes_externally: True
- name: inap-17304-LAN3326
routes_externally: False
openstackci-ovh:
regions:
- GRA1

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

@ -7,17 +7,24 @@ cache:
path: /var/cache/ansible-inventory
clouds:
openstackci-internap:
region_name: nyj01
profile: internap
auth:
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
regions:
- name: mtl01
values:
networks:
- name: inap-17301-WAN1102
routes_externally: True
- name: nyj01
values:
networks:
- name: inap-17301-WAN2344
routes_externally: True
- name: inap-17301-LAN3328
routes_externally: False
openstackci-ovh:
regions:
- GRA1