opendev/system-config
Code Issues Proposed changes

Merge "Add limestone-specific network configuration to *clouds.yaml"

Browse Source
This commit is contained in:
Zuul 2018-03-22 22:56:43 +00:00 committed by Gerrit Code Review
commit a68e9269d8
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,7 +131,16 @@ clouds:
user_domain_name: default
openstackci-limestone:
regions:
- RegionOne
- name: RegionOne
values:
networks:
- name: "Gateway Network"
routes_externally: false
routes_ipv6_externally: true
nat_destination: true
- name: "Flat External"
routes_externally: true
nat_source: true
auth:
auth_url: https://osa.continuous.pw:5000
username: <%= @puppetmaster_clouds['openstackci_limestone_username'] %>
@ -143,7 +152,16 @@ clouds:
cacert: /etc/openstack/limestone_cacert.pem
openstackzuul-limestone:
regions:
- RegionOne
- name: RegionOne
values:
networks:
- name: "Gateway Network"
routes_externally: false
routes_ipv6_externally: true
nat_destination: true
- name: "Flat External"
routes_externally: true
nat_source: true
auth:
auth_url: https://osa.continuous.pw:5000
username: <%= @puppetmaster_clouds['openstackzuul_limestone_username'] %>

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

@ -77,7 +77,16 @@ clouds:
user_domain_name: default
openstackci-limestone:
regions:
- RegionOne
- name: RegionOne
values:
networks:
- name: "Gateway Network"
routes_externally: false
routes_ipv6_externally: true
nat_destination: true
- name: "Flat External"
routes_externally: true
nat_source: true
auth:
auth_url: https://osa.continuous.pw:5000
username: <%= @puppetmaster_clouds['openstackci_limestone_username'] %>