opendev/system-config
Code Issues Proposed changes

Merge "Remove hpcloud from clouds.yaml listings"

Browse Source
This commit is contained in:
Jenkins 2016-02-02 01:04:45 +00:00 committed by Gerrit Code Review
commit 7f89817674
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,15 +20,6 @@ clouds:
password: <%= @puppetmaster_clouds['infra_files_rw_password'] %> password: <%= @puppetmaster_clouds['infra_files_rw_password'] %>
project_name: <%= @puppetmaster_clouds['infra_files_rw_project_name'] %> project_name: <%= @puppetmaster_clouds['infra_files_rw_project_name'] %>
region_name: DFW region_name: DFW
openstackci2-hpcloud:
profile: hp
auth:
username: <%= @puppetmaster_clouds['openstackci2_hpcloud_username'] %>
password: <%= @puppetmaster_clouds['openstackci2_hpcloud_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci2_hpcloud_project_name'] %>
regions:
- region-a.geo-1
- region-b.geo-1
openstackci-bluebox: openstackci-bluebox:
region_name: RegionOne region_name: RegionOne
auth: auth:

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

@ -4,15 +4,6 @@ cache:
expiration_time: 86400 expiration_time: 86400
path: /var/cache/ansible-inventory path: /var/cache/ansible-inventory
clouds: clouds:
openstackci2-hpcloud:
profile: hp
auth:
username: <%= @puppetmaster_clouds['openstackci2_hpcloud_username'] %>
password: <%= @puppetmaster_clouds['openstackci2_hpcloud_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci2_hpcloud_project_name'] %>
regions:
- region-a.geo-1
- region-b.geo-1
openstackci-bluebox: openstackci-bluebox:
region_name: RegionOne region_name: RegionOne
auth: auth: