From 233b4b02576a69f7d9b65acbd95071ed792ec49b Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sun, 10 Dec 2017 20:24:20 +0100
Subject: [PATCH] Retire apps site remains

The app catalog was retired earlier this year, see
http://lists.openstack.org/pipermail/openstack-operators/2017-July/013965.html

The site is retired as well.

We can remove now any remains about these.

Change-Id: I6bb5740e622cbf214fd6d94847a5cf93cc01f1f8
Depends-On: I638cc127d3588d757a4da01984a2bd292a84413c
---
 doc/source/apps_site.rst | 36 -------------------------------
 doc/source/systems.rst   |  1 -
 manifests/site.pp        | 46 ----------------------------------------
 modules.env              |  1 -
 4 files changed, 84 deletions(-)
 delete mode 100644 doc/source/apps_site.rst

diff --git a/doc/source/apps_site.rst b/doc/source/apps_site.rst
deleted file mode 100644
index 541c8a260f..0000000000
--- a/doc/source/apps_site.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-:title: Apps Site
-
-.. _apps_site:
-
-Apps Site
-#########
-
-The `OpenStack Community App Catalog
-<http://apps.openstack.org>`_ is installed on
-apps.openstack.org.
-
-At a Glance
-===========
-
-:Hosts:
-  * http://apps.openstack.org
-:Puppet:
-  * https://git.openstack.org/cgit/openstack-infra/puppet-apps_site/tree/
-:Projects:
-  * https://git.openstack.org/cgit/openstack/app-catalog/
-:Bugs:
-  * https://storyboard.openstack.org/#!/project/817
-:Resources:
-  * `App Catalog Documentation <https://wiki.openstack.org/wiki/App-Catalog>`_
-
-Overview
-========
-
-The OpenStack Community App Catalog works by having contributors
-submit patches to modify YAML files in the
-https://git.openstack.org/cgit/openstack/app-catalog/ repository.
-The puppet module when executed pulls in updates to that repository
-which are then served at the http://apps.openstack.org/ site.
-
-More information on the App Catalog can be found in the
-https://wiki.openstack.org/wiki/App-Catalog article.
diff --git a/doc/source/systems.rst b/doc/source/systems.rst
index 01b10c9db8..55a63e4f2e 100644
--- a/doc/source/systems.rst
+++ b/doc/source/systems.rst
@@ -36,7 +36,6 @@ Major Systems
    kerberos
    afs
    askbot
-   apps_site
    translate
    openstack-health
    refstack
diff --git a/manifests/site.pp b/manifests/site.pp
index 5f31a6ae3e..dd31cfff53 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1822,52 +1822,6 @@ node /^translate-dev\d*\.openstack\.org$/ {
   }
 }
 
-# Node-OS: trusty
-node 'apps.openstack.org' {
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [80, 443],
-    sysadmins                 => hiera('sysadmins', []),
-  }
-  class { '::apps_site':
-    ssl_cert_file           => '/etc/ssl/certs/apps.openstack.org.pem',
-    ssl_cert_file_contents  => hiera('apps_ssl_cert_file_contents'),
-    ssl_key_file            => '/etc/ssl/private/apps.openstack.org.key',
-    ssl_key_file_contents   => hiera('apps_ssl_key_file_contents'),
-    ssl_chain_file          => '/etc/ssl/certs/apps.openstack.org_intermediate.pem',
-    ssl_chain_file_contents => hiera('apps_ssl_chain_file_contents'),
-  }
-}
-
-# Node-OS: trusty
-node 'apps-dev.openstack.org' {
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [80],
-    sysadmins                 => hiera('sysadmins', []),
-  }
-  class { '::apps_site':
-    without_glare   => false,
-  }
-  class { '::apps_site::plugins::glare':
-    use_ssl         => false,
-    memcache_server => '127.0.0.1:11211',
-    vhost_name      => $::fqdn,
-  }
-  class { '::apps_site::wsgi::apache':
-    use_ssl    => false,
-    servername => $::fqdn,
-  }
-  class { '::apps_site::catalog':
-    import_assets   => true,
-    domain          => $::fqdn,
-    glare_url       => "http://${::fqdn}:9494",
-    memcache_server => '127.0.0.1:11211',
-  }
-
-  Class['::apps_site'] ->
-    Class['::apps_site::plugins::glare'] ->
-      Class['::apps_site::wsgi::apache'] ->
-        Class['::apps_site::catalog']
-}
 
 # Node-OS: trusty
 node 'odsreg.openstack.org' {
diff --git a/modules.env b/modules.env
index aed537a199..5e25e6c975 100644
--- a/modules.env
+++ b/modules.env
@@ -91,7 +91,6 @@ SOURCE_MODULES["https://github.com/voxpupuli/puppet-puppetboard"]="2.4.0"
 # Please keep sorted
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-accessbot"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-ansible"]="origin/master"
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-apps_site"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-askbot"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-asterisk"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-bandersnatch"]="origin/master"