opendev
/
system-config
Code Issues Proposed changes

Merge "Retire apps site remains"

This commit is contained in:
Zuul 2017-12-13 18:36:07 +00:00 committed by Gerrit Code Review
parent 649d5a0310 233b4b0257
commit 8ac334eca9
4 changed files with 0 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
doc/source/apps_site.rst
View File

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

1
doc/source/systems.rst
View File

@ -36,7 +36,6 @@ Major Systems
kerberos
afs
askbot
apps_site
translate
openstack-health
refstack

46
manifests/site.pp
View File

@ -1765,52 +1765,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' {

1
modules.env
View File

@ -89,7 +89,6 @@ SOURCE_MODULES["https://github.com/voxpupuli/puppet-nodejs"]="1.2.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"