Merge "Remove activity-dev server"

doc/source/activity.rst

@@ -12,7 +12,6 @@ At a glance:
 
 :Hosts:
   * http://activity.openstack.org
-  * http://activity-dev.openstack.org
 
 :Bugs:
   * https://bugs.launchpad.net/openstack-community
@@ -25,6 +24,5 @@ At a glance:
 Overview
 ========
 
-At the moment only the staging server activity-dev is managed via
-puppet. It runs Apache. Eventually we'll have activity.openstack.org run
-fully on the official OpenStack Infrastructure.
+Eventually we'll have activity.openstack.org run fully on the official
+OpenStack Infrastructure.

manifests/site.pp

@@ -230,15 +230,6 @@ node 'etherpad-dev.openstack.org' {
   }
 }
 
-node 'activity-dev.openstack.org' {
-  class { 'openstack_project::activity_dev':
-    sysadmins               => hiera('sysadmins'),
-    site_admin_password     => hiera('activity_dev_site_admin_password'),
-    site_mysql_host         => hiera('activity_dev_site_mysql_host'),
-    site_mysql_password     => hiera('activity_dev_site_mysql_password'),
-  }
-}
-
 node 'wiki.openstack.org' {
   class { 'openstack_project::wiki':
     mysql_root_password     => hiera('wiki_db_password'),

modules/openstack_project/manifests/activity_dev.pp

@@ -1,56 +0,0 @@
-# Server for activity board - staging
-class openstack_project::activity_dev (
-  $site_admin_password = '',
-  $site_mysql_password = '',
-  $site_mysql_host = '',
-  $sysadmins = [],
-) {
-
-
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [22, 80],
-    sysadmins                 => $sysadmins,
-  }
-
-  realize (
-    User::Virtual::LocalUser['smaffulli'],
-  )
-
-  include apache
-
-  a2mod { 'rewrite':
-    ensure => present,
-  }
-  a2mod { 'proxy':
-    ensure => present,
-  }
-  a2mod { 'proxy_http':
-    ensure => present,
-  }
-
-  apache::vhost {'activity-dev.openstack.org':
-    port         => 80,
-    priority     => '50',
-    docroot      => '/srv/static/dash',
-    require      => File['/srv/static/dash'],
-  }
-
-  file { '/srv/static/dash':
-    ensure  => directory,
-    owner   => 'www-data',
-    group   => 'www-data',
-    mode    => '0775',
-    require => [
-      File['/srv/static'],
-      Package['apache2'],
-    ]
-  }
-
-  file { '/srv/static':
-    ensure  => directory,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0755',
-  }
-
-}