Merge "Add Apps Site to System Config"

doc/source/apps_site.rst

@@ -0,0 +1,36 @@
+: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/stackforge/apps-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/stackforge/apps-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.

doc/source/systems.rst

@@ -31,6 +31,7 @@ Major Systems
    kerberos
    afs
    askbot
+   apps_site
 
 .. NOTE(dhellmann): These projects were not listed above, or in any
    other toctree, which breaks the build. It's not clear why they were

manifests/site.pp

@@ -773,4 +773,14 @@ node 'translate-dev.openstack.org' {
   }
 }
 
+# Node-OS: trusty
+node 'apps.openstack.org' {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [80],
+    sysadmins                 => hiera('sysadmins', []),
+  }
+  class { '::apps_site':
+  }
+}
+
 # vim:sw=2:ts=2:expandtab:textwidth=79

modules.env

@@ -60,6 +60,7 @@ SOURCE_MODULES["https://git.openstack.org/openstack-infra/puppet-vcsrepo"]="0.0.
 OPENSTACK_GIT_ROOT=https://git.openstack.org
 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-bugdaystats"]="origin/master"