diff --git a/modules.env b/modules.env index 0a9bb1f5a7..2d8c3631bf 100644 --- a/modules.env +++ b/modules.env @@ -78,6 +78,7 @@ INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-pip"]="ori INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-github"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-httpd"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-openstackid"]="origin/master" +INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-planet"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-redis"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-ssh"]="origin/master" INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-reviewday"]="origin/master" diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp deleted file mode 100644 index d379988e5e..0000000000 --- a/modules/planet/manifests/init.pp +++ /dev/null @@ -1,19 +0,0 @@ -class planet { - package { 'planet-venus': - ensure => present, - } - - file { '/srv/planet': - ensure => directory, - } - - file { '/var/lib/planet': - ensure => directory, - } - - file { '/var/log/planet': - ensure => directory, - } -} - -# vim:sw=2:ts=2:expandtab:textwidth=79 diff --git a/modules/planet/manifests/site.pp b/modules/planet/manifests/site.pp deleted file mode 100644 index 4a749634dc..0000000000 --- a/modules/planet/manifests/site.pp +++ /dev/null @@ -1,28 +0,0 @@ -define planet::site( - $git_url, - $vhost_name = "planet.${name}.org" -) { - include apache - - apache::vhost { $vhost_name: - docroot => "/srv/planet/${name}", - port => 80, - priority => '50', - require => File['/srv/planet'], - } - - vcsrepo { "/var/lib/planet/${name}": - ensure => present, - provider => git, - require => File['/var/lib/planet'], - source => $git_url, - } - - cron { "update_planet_${name}": - command => "date >> /var/log/planet/${name}.log && cd /var/lib/planet/${name} && git pull -q --ff-only && planet /var/lib/planet/${name}/planet.ini >> /var/log/planet/${name}.log 2>&1", - minute => '*/5', - user => 'root', - } -} - -# vim:sw=2:ts=2:expandtab:textwidth=79