From cbff37f82e131a60b65014067e52ed50a9baf767 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 23 Feb 2018 14:08:46 +1100 Subject: [PATCH] Cleanup nodepool.openstack.org to be a zk server This is just a zookeeper server now, so doesn't need all these passwords, a cloud.yaml file or a launcher-esque deployment. Change-Id: I3cb20d9c8af150ecdc1fb0a16208a774e3fb530f --- manifests/site.pp | 64 ------------------- .../nodepool/nodepool.logging.conf.erb | 59 ----------------- 2 files changed, 123 deletions(-) delete mode 100644 modules/openstack_project/templates/nodepool/nodepool.logging.conf.erb diff --git a/manifests/site.pp b/manifests/site.pp index c0518ebcac..9296c42d3f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -971,36 +971,6 @@ node /^ns\d+\.openstack\.org$/ { # Node-OS: trusty node 'nodepool.openstack.org' { $group = 'nodepool' - # TODO(pabelanger): Move all of this back into nodepool manifest, it has - # grown too big. - $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') - $vexxhost_username = hiera('nodepool_vexxhost_username', 'username') - $vexxhost_password = hiera('nodepool_vexxhost_password') - $vexxhost_project = hiera('nodepool_vexxhost_project', 'project') - $citycloud_username = hiera('nodepool_citycloud_username', 'username') - $citycloud_password = hiera('nodepool_citycloud_password') - $linaro_username = hiera('nodepool_linaro_username', 'username') - $linaro_password = hiera('nodepool_linaro_password') - $linaro_project = hiera('nodepool_linaro_project', 'project') - $limestone_username = hiera('nodepool_limestone_username', 'username') - $limestone_password = hiera('nodepool_limestone_password') - $limestone_project = hiera('nodepool_limestone_project', 'project') - - $clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb") class { 'openstack_project::server': iptables_allowed_hosts => [ @@ -1028,40 +998,6 @@ node 'nodepool.openstack.org' { include openstack_project - class { '::openstackci::nodepool': - vhost_name => 'nodepool.openstack.org', - project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', - mysql_password => hiera('nodepool_mysql_password'), - mysql_root_password => hiera('nodepool_mysql_root_password'), - nodepool_ssh_public_key => hiera('zuul_worker_ssh_public_key_contents'), - # TODO(pabelanger): Switch out private key with zuul_worker once we are - # ready. - nodepool_ssh_private_key => hiera('jenkins_ssh_private_key_contents'), - oscc_file_contents => $clouds_yaml, - image_log_document_root => '/var/log/nodepool/image', - statsd_host => 'graphite.openstack.org', - logging_conf_template => 'openstack_project/nodepool/nodepool.logging.conf.erb', - upload_workers => '16', - jenkins_masters => [], - split_daemon => true, - } - file { '/home/nodepool/.config/openstack/limestone_cacert.pem': - ensure => present, - owner => 'nodepool', - group => 'nodepool', - mode => '0600', - content => hiera('limestone_ssl_cert_file_contents'), - require => Class['::openstackci::nodepool'], - } - - cron { 'mirror_gitgc': - user => 'nodepool', - hour => '20', - minute => '0', - command => 'find /opt/dib_cache/source-repositories/ -maxdepth 1 -type d -name "*.git" -exec git --git-dir="{}" gc \; >/dev/null', - environment => 'PATH=/usr/bin:/bin:/usr/sbin:/sbin', - require => Class['::openstackci::nodepool'], - } } # Node-OS: xenial diff --git a/modules/openstack_project/templates/nodepool/nodepool.logging.conf.erb b/modules/openstack_project/templates/nodepool/nodepool.logging.conf.erb deleted file mode 100644 index c4c0e916fd..0000000000 --- a/modules/openstack_project/templates/nodepool/nodepool.logging.conf.erb +++ /dev/null @@ -1,59 +0,0 @@ -[loggers] -keys=root,nodepool,requests,shade,openstack - -[handlers] -keys=console,debug,normal - -[formatters] -keys=simple - -[logger_root] -level=WARNING -handlers=console - -[logger_requests] -level=WARNING -handlers=debug,normal -qualname=requests - -[logger_shade] -level=WARNING -handlers=debug,normal -qualname=shade - -[logger_openstack] -level=WARNING -handlers=debug,normal -qualname=openstack - -[logger_gear] -level=DEBUG -handlers=debug,normal -qualname=gear - -[logger_nodepool] -level=DEBUG -handlers=debug,normal -qualname=nodepool - -[handler_console] -level=WARNING -class=StreamHandler -formatter=simple -args=(sys.stdout,) - -[handler_debug] -level=DEBUG -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('/var/log/nodepool/debug.log', 'H', 8, 30,) - -[handler_normal] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('/var/log/nodepool/nodepool.log', 'H', 8, 30,) - -[formatter_simple] -format=%(asctime)s %(levelname)s %(name)s: %(message)s -datefmt=