opendev/system-config
Code Issues Proposed changes

Verify SSL with OSIC

Browse Source 
OSIC now has DNS configured with a proper verifiable certificate so use
it.

Change-Id: If09d716b8aa466678fffd5bdddc176fbaaf7b949
This commit is contained in:
Clark Boylan 2016-03-04 08:17:16 -08:00
parent 744b62c6af
commit 8818183c33
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,16 +49,13 @@ clouds:
osic: osic:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://172.99.101.17:5000 auth_url: https://cloud1.osic.org:5000
username: <%= osic_username %> username: <%= osic_username %>
password: <%= osic_password %> password: <%= osic_password %>
project_name: <%= osic_project %> project_name: <%= osic_project %>
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
identity_api_version: '3' identity_api_version: '3'
# Since DNS is not setup for the CN in the self signed cert we are not
# able to verify even if we provide the cert to check against.
verify: False
vexxhost: vexxhost:
region_name: ca-ymq-1 region_name: ca-ymq-1
profile: vexxhost profile: vexxhost

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

@ -115,29 +115,23 @@ clouds:
openstackjenkins-osic: openstackjenkins-osic:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://172.99.101.17:5000 auth_url: https://cloud1.osic.org:5000
username: <%= @puppetmaster_clouds['openstackjenkins_osic_username'] %> username: <%= @puppetmaster_clouds['openstackjenkins_osic_username'] %>
password: <%= @puppetmaster_clouds['openstackjenkins_osic_password'] %> password: <%= @puppetmaster_clouds['openstackjenkins_osic_password'] %>
project_name: <%= @puppetmaster_clouds['openstackjenkins_osic_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackjenkins_osic_project_name'] %>
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
identity_api_version: '3' identity_api_version: '3'
# Since DNS is not setup for the CN in the self signed cert we are not
# able to verify even if we provide the cert to check against.
verify: False
openstackci-osic: openstackci-osic:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://172.99.101.17:5000 auth_url: https://cloud1.osic.org:5000
username: <%= @puppetmaster_clouds['openstackci_osic_username'] %> username: <%= @puppetmaster_clouds['openstackci_osic_username'] %>
password: <%= @puppetmaster_clouds['openstackci_osic_password'] %> password: <%= @puppetmaster_clouds['openstackci_osic_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_osic_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackci_osic_project_name'] %>
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
identity_api_version: '3' identity_api_version: '3'
# Since DNS is not setup for the CN in the self signed cert we are not
# able to verify even if we provide the cert to check against.
verify: False
openstackjenkins-vexxhost: openstackjenkins-vexxhost:
region_name: ca-ymq-1 region_name: ca-ymq-1
profile: vexxhost profile: vexxhost

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

@ -41,16 +41,13 @@ clouds:
openstackci-osic: openstackci-osic:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://172.99.101.17:5000 auth_url: https://cloud1.osic.org:5000
username: <%= @puppetmaster_clouds['openstackci_osic_username'] %> username: <%= @puppetmaster_clouds['openstackci_osic_username'] %>
password: <%= @puppetmaster_clouds['openstackci_osic_password'] %> password: <%= @puppetmaster_clouds['openstackci_osic_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_osic_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackci_osic_project_name'] %>
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
identity_api_version: '3' identity_api_version: '3'
# Since DNS is not setup for the CN in the self signed cert we are not
# able to verify even if we provide the cert to check against.
verify: False
openstackci-vexxhost: openstackci-vexxhost:
region_name: ca-ymq-1 region_name: ca-ymq-1
profile: vexxhost profile: vexxhost