Merge "Split out planet module"

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"

modules/planet/manifests/init.pp

@@ -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

modules/planet/manifests/site.pp

@@ -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