opendev/system-config
Code Issues Proposed changes

Merge "Remove entercloud credentials"

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

6
manifests/site.pp
View File

@ -828,8 +828,6 @@ node 'nodepool.openstack.org' {
$datacentred_project = hiera('nodepool_datacentred_project', 'project')
$citycloud_username = hiera('nodepool_citycloud_username', 'username')
$citycloud_password = hiera('nodepool_citycloud_password')
$entercloud_username = hiera('nodepool_entercloud_username', 'username')
$entercloud_password = hiera('nodepool_entercloud_password')
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
$zk_receivers = [
@ -935,8 +933,6 @@ node /^nl\d+\.openstack\.org$/ {
$datacentred_project = hiera('nodepool_datacentred_project', 'project')
$citycloud_username = hiera('nodepool_citycloud_username', 'username')
$citycloud_password = hiera('nodepool_citycloud_password')
$entercloud_username = hiera('nodepool_entercloud_username', 'username')
$entercloud_password = hiera('nodepool_entercloud_password')
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
class { 'openstack_project::server':
@ -1008,8 +1004,6 @@ node /^nb\d+\.openstack\.org$/ {
$datacentred_project = hiera('nodepool_datacentred_project', 'project')
$citycloud_username = hiera('nodepool_citycloud_username', 'username')
$citycloud_password = hiera('nodepool_citycloud_password')
$entercloud_username = hiera('nodepool_entercloud_username', 'username')
$entercloud_password = hiera('nodepool_entercloud_password')
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
class { 'openstack_project::server':
sysadmins => hiera('sysadmins', []),

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

@ -106,16 +106,3 @@ clouds:
project_id: bed89257500340af8d0fbe7141b1bfd6
project_domain_id: a5e7d1a8f25b42b081cf89d1130638da
user_domain_id: a5e7d1a8f25b42b081cf89d1130638da
entercloud:
regions:
- nl-ams1
- de-fra1
- it-mil1
profile: entercloudsuite
image_api_version: '1'
auth:
username: '<%= @entercloud_username %>'
password: '<%= @entercloud_password %>'
project_id: 1ceb779ea58d4e14b6238b3413f06634
user_domain_id: default
project_domain_id: default

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

@ -227,16 +227,3 @@ clouds:
project_id: bed89257500340af8d0fbe7141b1bfd6
project_domain_id: a5e7d1a8f25b42b081cf89d1130638da
user_domain_id: a5e7d1a8f25b42b081cf89d1130638da
openstackzuul-entercloud:
regions:
- nl-ams1
- de-fra1
- it-mil1
profile: entercloudsuite
image_api_version: '1'
auth:
username: <%= @puppetmaster_clouds['openstackzuul_entercloud_username'] %>
password: <%= @puppetmaster_clouds['openstackzuul_entercloud_password'] %>
project_id: 1ceb779ea58d4e14b6238b3413f06634
user_domain_id: default
project_domain_id: default