From f1b91ec580df4d96e856908d05869738a7dd251b Mon Sep 17 00:00:00 2001
From: "Elizabeth K. Joseph" <lyz@princessleia.com>
Date: Wed, 28 Jan 2015 10:32:16 -0800
Subject: [PATCH] Split out planet module

Change-Id: I5ba1000e2b29bea1a5fabbc75f534b536ab75cc7
---
 modules.env                      |  1 +
 modules/planet/manifests/init.pp | 19 -------------------
 modules/planet/manifests/site.pp | 28 ----------------------------
 3 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 modules/planet/manifests/init.pp
 delete mode 100644 modules/planet/manifests/site.pp

diff --git a/modules.env b/modules.env
index a9460a0c49..4429ac8343 100644
--- a/modules.env
+++ b/modules.env
@@ -76,6 +76,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