opendev/system-config
Code Issues Proposed changes

Merge "Verify SSL with OSIC"

Browse Source
This commit is contained in:
Jenkins 2016-03-04 23:25:22 +00:00 committed by Gerrit Code Review
commit 032b0d641f
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:
region_name: RegionOne
auth:
auth_url: https://172.99.101.17:5000
auth_url: https://cloud1.osic.org:5000
username: <%= osic_username %>
password: <%= osic_password %>
project_name: <%= osic_project %>
project_domain_name: default
user_domain_name: default
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:
region_name: ca-ymq-1
profile: vexxhost

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

@ -115,29 +115,23 @@ clouds:
openstackjenkins-osic:
region_name: RegionOne
auth:
auth_url: https://172.99.101.17:5000
auth_url: https://cloud1.osic.org:5000
username: <%= @puppetmaster_clouds['openstackjenkins_osic_username'] %>
password: <%= @puppetmaster_clouds['openstackjenkins_osic_password'] %>
project_name: <%= @puppetmaster_clouds['openstackjenkins_osic_project_name'] %>
project_domain_name: default
user_domain_name: default
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:
region_name: RegionOne
auth:
auth_url: https://172.99.101.17:5000
auth_url: https://cloud1.osic.org:5000
username: <%= @puppetmaster_clouds['openstackci_osic_username'] %>
password: <%= @puppetmaster_clouds['openstackci_osic_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_osic_project_name'] %>
project_domain_name: default
user_domain_name: default
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:
region_name: ca-ymq-1
profile: vexxhost

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

@ -41,16 +41,13 @@ clouds:
openstackci-osic:
region_name: RegionOne
auth:
auth_url: https://172.99.101.17:5000
auth_url: https://cloud1.osic.org:5000
username: <%= @puppetmaster_clouds['openstackci_osic_username'] %>
password: <%= @puppetmaster_clouds['openstackci_osic_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_osic_project_name'] %>
project_domain_name: default
user_domain_name: default
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:
region_name: ca-ymq-1
profile: vexxhost