opendev/system-config
Code Issues Proposed changes

Tell shade that OSIC doesn't need floating ips

Browse Source 
shade will figure this out and do the right thing, but it'll be at the
expense of a bunch more API calls. We konw we don't need them, so short
circuit the detection.

Change-Id: Id893bfec1c5c0abcc5b448899e04de20f7f41363
This commit is contained in:
Monty Taylor 2016-08-13 11:41:32 -05:00
parent b4bd992821
commit af2f1fb254
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,6 +72,7 @@ clouds:
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
identity_api_version: '3' identity_api_version: '3'
floating_ip_source: None
vexxhost: vexxhost:
region_name: ca-ymq-1 region_name: ca-ymq-1
profile: vexxhost profile: vexxhost

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

@ -141,6 +141,7 @@ clouds:
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
identity_api_version: '3' identity_api_version: '3'
floating_ip_source: None
openstackci-osic-cloud1: openstackci-osic-cloud1:
region_name: RegionOne region_name: RegionOne
auth: auth:
@ -151,6 +152,7 @@ clouds:
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
identity_api_version: '3' identity_api_version: '3'
floating_ip_source: None
openstackjenkins-vexxhost: openstackjenkins-vexxhost:
region_name: ca-ymq-1 region_name: ca-ymq-1
profile: vexxhost profile: vexxhost

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

@ -48,6 +48,7 @@ clouds:
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
identity_api_version: '3' identity_api_version: '3'
floating_ip_source: None
openstackci-vexxhost: openstackci-vexxhost:
region_name: ca-ymq-1 region_name: ca-ymq-1
profile: vexxhost profile: vexxhost