Remove infracloudwest from ansible-clouds.yaml
Ansible-clouds.yaml becomes /etc/openstack/clouds.yaml on the puppetmaster and is used forr the ansible dynamic inventory. When a cloud there does not respond, the ansible inventory fails completely. Remove infracloudwest from all-clouds.yaml until it comes back. Change-Id: I34d265a60f0a97f040b6703ab74c93a8fd0063af
This commit is contained in:
parent
b79426f968
commit
f6fc0c426d
modules/openstack_project
@ -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',
|
||||||
|
@ -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
|
||||||
|
@ -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'
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user