Add Apps Site to System Config

This commit adds documentation and a module entry
for the apps_site puppet module which will host
the content for the OpenStack Community App
Catalog.

Change-Id: Ie1c53b6591135f9833e8f83ca7da82984cd68282
Depends-On: Ic9aa9385970ba98c50e915ffa8127ef0182744db
This commit is contained in:
Christopher Aedo 2015-06-02 22:29:27 -07:00 committed by Jeremy Stanley
parent e12eb7b409
commit c99241213d
4 changed files with 48 additions and 0 deletions

36
doc/source/apps_site.rst Normal file
View File

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

View File

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

View File

@ -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 # vim:sw=2:ts=2:expandtab:textwidth=79

View File

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