opendev/system-config
Code Issues Proposed changes

Merge "Remove infracloudwest from ansible-clouds.yaml"

Browse Source
This commit is contained in:
Jenkins 2016-03-01 02:55:18 +00:00 committed by Gerrit Code Review
commit d5c703566d
3 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/manifests/puppetmaster.pp
View File

@ -137,7 +137,7 @@ class openstack_project::puppetmaster (
} }
file { '/etc/openstack/infracloud_west_cacert.pem': file { '/etc/openstack/infracloud_west_cacert.pem':
ensure => present, ensure => absent,
owner => 'root', owner => 'root',
group => 'admin', group => 'admin',
mode => '0660', mode => '0660',

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

@ -77,37 +77,6 @@ clouds:
username: <%= @puppetmaster_clouds['openstackjenkins_bluebox_username'] %> username: <%= @puppetmaster_clouds['openstackjenkins_bluebox_username'] %>
password: <%= @puppetmaster_clouds['openstackjenkins_bluebox_password'] %> password: <%= @puppetmaster_clouds['openstackjenkins_bluebox_password'] %>
project_name: <%= @puppetmaster_clouds['openstackjenkins_bluebox_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackjenkins_bluebox_project_name'] %>
openstackjenkins-infracloud-west:
region_name: RegionOne
auth:
auth_url: https://controller00.hpuswest.ic.openstack.org:35357/
username: <%= @puppetmaster_clouds['openstackjenkins_infracloud_username'] %>
password: <%= @puppetmaster_clouds['openstackjenkins_infracloud_password'] %>
project_name: <%= @puppetmaster_clouds['openstackjenkins_infracloud_project_name'] %>
project_domain_name: 'infra'
user_domain_name: 'infra'
cacert: '/etc/openstack/infracloud_west_cacert.pem'
identity_api_version: '3'
openstackci-infracloud-west:
region_name: RegionOne
auth:
auth_url: https://controller00.hpuswest.ic.openstack.org:35357/
username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %>
password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %>
project_domain_name: 'infra'
user_domain_name: 'infra'
cacert: '/etc/openstack/infracloud_west_cacert.pem'
identity_api_version: '3'
admin-infracloud-west:
region_name: RegionOne
auth:
auth_url: https://controller00.hpuswest.ic.openstack.org:35357/
username: <%= @puppetmaster_clouds['admin_infracloud_username'] %>
password: <%= @puppetmaster_clouds['admin_infracloud_password'] %>
project_name: <%= @puppetmaster_clouds['admin_infracloud_project_name'] %>
cacert: '/etc/openstack/infracloud_west_cacert.pem'
identity_api_version: '3'
openstackjenkins-rax: openstackjenkins-rax:
regions: regions:
- DFW - DFW

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

@ -38,14 +38,3 @@ clouds:
username: <%= @puppetmaster_clouds['openstackci_rax_username'] %> username: <%= @puppetmaster_clouds['openstackci_rax_username'] %>
password: <%= @puppetmaster_clouds['openstackci_rax_password'] %> password: <%= @puppetmaster_clouds['openstackci_rax_password'] %>
project_id: <%= @puppetmaster_clouds['openstackci_rax_project_id'] %> project_id: <%= @puppetmaster_clouds['openstackci_rax_project_id'] %>
openstackci-infracloud-west:
region_name: RegionOne
auth:
auth_url: https://controller00.hpuswest.ic.openstack.org:35357/
username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %>
password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %>
project_domain_name: 'infra'
user_domain_name: 'infra'
cacert: '/etc/openstack/infracloud_west_cacert.pem'
identity_api_version: '3'