From 707d7fddcd95f01c8dbfef047c4e753de362d9c8 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 7 Feb 2017 10:48:57 -0500 Subject: [PATCH] Add nl01.openstack.org server Stand up a server we'll be using for nodepool (zuulv3) testing. We'll be using this for the Atlanta PTG with the goal of moving it into production when our feature/zuulv3 branch is merged into master for nodepool. Change-Id: I7a3edb871510d1000a9bbf06944551d4b272ac8d Depends-On: I29e661e38e9a2a56a01a1c30f1dc1eae97a4de7b Signed-off-by: Paul Belanger --- hiera/common.yaml | 1 + manifests/site.pp | 80 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/hiera/common.yaml b/hiera/common.yaml index b9db37add0..ad15090238 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -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 diff --git a/manifests/site.pp b/manifests/site.pp index ef16c1919c..193c27b3a5 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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$/ {