From 17b4cbc317609e9d7887fa0c43fd5c595e91e870 Mon Sep 17 00:00:00 2001 From: Emma Barber Date: Mon, 24 Aug 2015 23:23:06 -0700 Subject: [PATCH] Add codesearch.o.o node and module puppet-hound is in working order. This adds puppet-hound to INTEGRATION_MODULES, creates a new codesearch.o.o node, and installs hound on it. Depends-On: Ie4b6509947f58407c4cc6f5a2c7c2bc84c619ce9 Change-Id: I238b05e8b25229d7dcf840441cd9d3af09f3e249 --- manifests/site.pp | 11 ++++++ modules.env | 1 + .../openstack_project/manifests/codesearch.pp | 35 +++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 modules/openstack_project/manifests/codesearch.pp diff --git a/manifests/site.pp b/manifests/site.pp index c6a3855df0..fdd68396ee 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1011,4 +1011,15 @@ node 'odsreg.openstack.org' { } } +# Node-OS: trusty +node 'codesearch.openstack.org' { + class { 'openstack_project::server': + iptables_public_tcp_ports => [80], + sysadmins => hiera('sysadmins', []), + } + class { 'openstack_project::codesearch': + project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', + } +} + # vim:sw=2:ts=2:expandtab:textwidth=79 diff --git a/modules.env b/modules.env index a5ce447adf..27b06a344a 100644 --- a/modules.env +++ b/modules.env @@ -86,6 +86,7 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-gerritbot"]="ori INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-github"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-graphite"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-haveged"]="origin/master" +INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-hound"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-httpd"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-iptables"]="origin/master" INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-jeepyb"]="origin/master" diff --git a/modules/openstack_project/manifests/codesearch.pp b/modules/openstack_project/manifests/codesearch.pp new file mode 100644 index 0000000000..467a7f7526 --- /dev/null +++ b/modules/openstack_project/manifests/codesearch.pp @@ -0,0 +1,35 @@ +# Class to configure hound on a node. +class openstack_project::codesearch ( + $project_config_repo, +) { + + class { 'project_config': + url => $project_config_repo, + } + + class { 'hound': + manage_config => false, + } + + include ::jeepyb + include ::logrotate + include ::pip + + file { '/home/hound/config.json': + ensure => 'present', + } + + exec { 'create-hound-config': + command => 'create-hound-config', + path => '/bin:/usr/bin:/usr/local/bin', + environment => "PROJECTS_YAML=${::project_config::jeepyb_project_file}", + user => 'hound', + cwd => '/home/hound', + require => [ + $::project_config::config_dir, + File['/home/hound'], + ], + notify => Service['hound'] + } + +}