opendev/system-config
Code Issues Proposed changes

Merge "Add nl01.openstack.org server"

Browse Source
This commit is contained in:
Jenkins 2017-02-15 21:41:47 +00:00 committed by Gerrit Code Review
commit 432ab99180
2 changed files with 81 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hiera/common.yaml
View File

@ -450,6 +450,7 @@ cacti_hosts:
- logstash.openstack.org
- nb01.openstack.org
- nb02.openstack.org
- nl01.openstack.org
- nodepool.openstack.org
- openstackid.org
- paste.openstack.org

80
manifests/site.pp
View File

@ -916,6 +916,86 @@ node 'nodepool.openstack.org' {
}
}
# Node-OS: trusty
# Node-OS: xenial
node /^nl\d+\.openstack\.org$/ {
$group = 'nodepool'
# TODO(pabelanger): Move all of this back into nodepool manifest, it has
# grown too big.
$bluebox_username = hiera('nodepool_bluebox_username', 'username')
$bluebox_password = hiera('nodepool_bluebox_password')
$bluebox_project = hiera('nodepool_bluebox_project', 'project')
$rackspace_username = hiera('nodepool_rackspace_username', 'username')
$rackspace_password = hiera('nodepool_rackspace_password')
$rackspace_project = hiera('nodepool_rackspace_project', 'project')
$hpcloud_username = hiera('nodepool_hpcloud_username', 'username')
$hpcloud_password = hiera('nodepool_hpcloud_password')
$hpcloud_project = hiera('nodepool_hpcloud_project', 'project')
$internap_username = hiera('nodepool_internap_username', 'username')
$internap_password = hiera('nodepool_internap_password')
$internap_project = hiera('nodepool_internap_project', 'project')
$ovh_username = hiera('nodepool_ovh_username', 'username')
$ovh_password = hiera('nodepool_ovh_password')
$ovh_project = hiera('nodepool_ovh_project', 'project')
$tripleo_username = hiera('nodepool_tripleo_username', 'username')
$tripleo_password = hiera('nodepool_tripleo_password')
$tripleo_project = hiera('nodepool_tripleo_project', 'project')
$infracloud_vanilla_username = hiera('nodepool_infracloud_vanilla_username', 'username')
$infracloud_vanilla_password = hiera('nodepool_infracloud_vanilla_password')
$infracloud_vanilla_project = hiera('nodepool_infracloud_vanilla_project', 'project')
$infracloud_chocolate_username = hiera('nodepool_infracloud_chocolate_username', 'username')
$infracloud_chocolate_password = hiera('nodepool_infracloud_chocolate_password')
$infracloud_chocolate_project = hiera('nodepool_infracloud_chocolate_project', 'project')
$osic_cloud1_username = hiera('nodepool_osic_cloud1_username', 'username')
$osic_cloud1_password = hiera('nodepool_osic_cloud1_password')
$osic_cloud1_project = hiera('nodepool_osic_cloud1_project', 'project')
$osic_cloud8_username = hiera('nodepool_osic_cloud8_username', 'username')
$osic_cloud8_password = hiera('nodepool_osic_cloud8_password')
$osic_cloud8_project = hiera('nodepool_osic_cloud8_project', 'project')
$vexxhost_username = hiera('nodepool_vexxhost_username', 'username')
$vexxhost_password = hiera('nodepool_vexxhost_password')
$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_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', []),
}
include openstack_project
class { '::openstackci::nodepool_launcher':
nodepool_ssh_public_key => hiera('zuul_worker_ssh_public_key_contents'),
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
oscc_file_contents => $clouds_yaml,
statsd_host => 'graphite.openstack.org',
revision => 'feature/zuulv3',
}
file { '/home/nodepool/.config/openstack/infracloud_vanilla_cacert.pem':
ensure => present,
owner => 'nodepool',
group => 'nodepool',
mode => '0600',
content => hiera('infracloud_vanilla_ssl_cert_file_contents'),
require => Class['::openstackci::nodepool_launcher'],
}
file { '/home/nodepool/.config/openstack/infracloud_chocolate_cacert.pem':
ensure => present,
owner => 'nodepool',
group => 'nodepool',
mode => '0600',
content => hiera('infracloud_chocolate_ssl_cert_file_contents'),
require => Class['::openstackci::nodepool_launcher'],
}
}
# Node-OS: trusty
# Node-OS: xenial
node /^nb\d+\.openstack\.org$/ {