opendev/system-config
Code Issues Proposed changes

Merge "Remove datacentred credentials"

Browse Source
This commit is contained in:
Jenkins 2017-09-03 23:08:05 +00:00 committed by Gerrit Code Review
commit 899c8bbbdd
3 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/site.pp
View File

@ -823,9 +823,6 @@ node 'nodepool.openstack.org' {
$vexxhost_username = hiera('nodepool_vexxhost_username', 'username') $vexxhost_username = hiera('nodepool_vexxhost_username', 'username')
$vexxhost_password = hiera('nodepool_vexxhost_password') $vexxhost_password = hiera('nodepool_vexxhost_password')
$vexxhost_project = hiera('nodepool_vexxhost_project', 'project') $vexxhost_project = hiera('nodepool_vexxhost_project', 'project')
$datacentred_username = hiera('nodepool_datacentred_username', 'username')
$datacentred_password = hiera('nodepool_datacentred_password')
$datacentred_project = hiera('nodepool_datacentred_project', 'project')
$citycloud_username = hiera('nodepool_citycloud_username', 'username') $citycloud_username = hiera('nodepool_citycloud_username', 'username')
$citycloud_password = hiera('nodepool_citycloud_password') $citycloud_password = hiera('nodepool_citycloud_password')
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb") $clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
@ -928,9 +925,6 @@ node /^nl\d+\.openstack\.org$/ {
$vexxhost_username = hiera('nodepool_vexxhost_username', 'username') $vexxhost_username = hiera('nodepool_vexxhost_username', 'username')
$vexxhost_password = hiera('nodepool_vexxhost_password') $vexxhost_password = hiera('nodepool_vexxhost_password')
$vexxhost_project = hiera('nodepool_vexxhost_project', 'project') $vexxhost_project = hiera('nodepool_vexxhost_project', 'project')
$datacentred_username = hiera('nodepool_datacentred_username', 'username')
$datacentred_password = hiera('nodepool_datacentred_password')
$datacentred_project = hiera('nodepool_datacentred_project', 'project')
$citycloud_username = hiera('nodepool_citycloud_username', 'username') $citycloud_username = hiera('nodepool_citycloud_username', 'username')
$citycloud_password = hiera('nodepool_citycloud_password') $citycloud_password = hiera('nodepool_citycloud_password')
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb") $clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
@ -999,9 +993,6 @@ node /^nb\d+\.openstack\.org$/ {
$vexxhost_username = hiera('nodepool_vexxhost_username', 'username') $vexxhost_username = hiera('nodepool_vexxhost_username', 'username')
$vexxhost_password = hiera('nodepool_vexxhost_password') $vexxhost_password = hiera('nodepool_vexxhost_password')
$vexxhost_project = hiera('nodepool_vexxhost_project', 'project') $vexxhost_project = hiera('nodepool_vexxhost_project', 'project')
$datacentred_username = hiera('nodepool_datacentred_username', 'username')
$datacentred_password = hiera('nodepool_datacentred_password')
$datacentred_project = hiera('nodepool_datacentred_project', 'project')
$citycloud_username = hiera('nodepool_citycloud_username', 'username') $citycloud_username = hiera('nodepool_citycloud_username', 'username')
$citycloud_password = hiera('nodepool_citycloud_password') $citycloud_password = hiera('nodepool_citycloud_password')
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb") $clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")

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

@ -83,16 +83,6 @@ clouds:
identity_api_version: '3' identity_api_version: '3'
floating_ip_source: None floating_ip_source: None
cacert: /home/nodepool/.config/openstack/infracloud_chocolate_cacert.pem cacert: /home/nodepool/.config/openstack/infracloud_chocolate_cacert.pem
datacentred:
region_name: sal01
profile: datacentred
auth:
username: '<%= @datacentred_username %>'
password: '<%= @datacentred_password %>'
project_name: '<%= @datacentred_project %>'
project_domain_name: default
user_domain_name: default
identity_api_version: '2'
citycloud: citycloud:
regions: regions:
- Lon1 - Lon1

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

@ -191,16 +191,6 @@ clouds:
username: '<%= @puppetmaster_clouds['openstackci_vexxhost_username'] %>' username: '<%= @puppetmaster_clouds['openstackci_vexxhost_username'] %>'
password: '<%= @puppetmaster_clouds['openstackci_vexxhost_password'] %>' password: '<%= @puppetmaster_clouds['openstackci_vexxhost_password'] %>'
project_name: '<%= @puppetmaster_clouds['openstackci_vexxhost_project_name'] %>' project_name: '<%= @puppetmaster_clouds['openstackci_vexxhost_project_name'] %>'
openstackzuul-datacentred:
region_name: sal01
profile: datacentred
auth:
username: <%= @puppetmaster_clouds['openstackzuul_datacentred_username'] %>
password: <%= @puppetmaster_clouds['openstackzuul_datacentred_password'] %>
project_name: <%= @puppetmaster_clouds['openstackzuul_datacentred_project'] %>
project_domain_name: default
user_domain_name: default
identity_api_version: '2'
openstackci-citycloud: openstackci-citycloud:
regions: regions:
- Lon1 - Lon1