diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index dade81e..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Gemfile.lock
-.bundled_gems/
diff --git a/.gitreview b/.gitreview
deleted file mode 100644
index 0848737..0000000
--- a/.gitreview
+++ /dev/null
@@ -1,4 +0,0 @@
-[gerrit]
-host=review.openstack.org
-port=29418
-project=openstack-infra/puppet-apps_site.git
diff --git a/Gemfile b/Gemfile
deleted file mode 100644
index 9854cc9..0000000
--- a/Gemfile
+++ /dev/null
@@ -1,15 +0,0 @@
-source 'https://rubygems.org'
-
-if ENV['ZUUL_REF'] && File.exists?("#{ENV['WORKSPACE']}/openstack-infra/puppet-openstack_infra_spec_helper")
- gem_checkout_method = {:path => "#{ENV['WORKSPACE']}/openstack-infra/puppet-openstack_infra_spec_helper"}
-else
- gem_checkout_method = {:git => 'https://git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper'}
-end
-gem_checkout_method[:require] = false
-
-group :development, :test, :system_tests do
- gem 'puppet-openstack_infra_spec_helper',
- gem_checkout_method
-end
-
-# vim:ft=ruby
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/README.md b/README.md
deleted file mode 100644
index 93c80ec..0000000
--- a/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# OpenStack App Catalog Module
-
-## Overview
-
-Configures App Catalog.
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000..b5457de
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,11 @@
+This project is no longer maintained.
+
+The contents of this repository are still available in the Git
+source code management system. To see the contents of this
+repository before it reached its end of life, please check out the
+previous commit with "git checkout HEAD^1".
+
+For any further questions, please email
+openstack-dev@lists.openstack.org or join #openstack-infra on
+Freenode.
+
diff --git a/Rakefile b/Rakefile
deleted file mode 100644
index ff1f0d7..0000000
--- a/Rakefile
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-PuppetLint.configuration.fail_on_warnings = true
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.send('disable_autoloader_layout')
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-PuppetLint.configuration.send('disable_class_parameter_defaults')
diff --git a/bindep.txt b/bindep.txt
deleted file mode 100644
index 7cdd58e..0000000
--- a/bindep.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-# This is a cross-platform list tracking distribution packages needed by tests;
-# see http://docs.openstack.org/infra/bindep/ for additional information.
-
-libxml2-devel [test platform:rpm]
-libxml2-dev [test platform:dpkg]
-libxslt-devel [test platform:rpm]
-libxslt1-dev [test platform:dpkg]
-ruby-devel [test platform:rpm]
-ruby-dev [test platform:dpkg]
-zlib1g-dev [test platform:dpkg]
-zlib-devel [test platform:rpm]
diff --git a/examples/app_site_with_glare_using_git.pp b/examples/app_site_with_glare_using_git.pp
deleted file mode 100644
index e8ec6e2..0000000
--- a/examples/app_site_with_glare_using_git.pp
+++ /dev/null
@@ -1,48 +0,0 @@
-#if you want to install app_site with glare support via git, memcache installed on localhost
-$vhost_name = $::fqdn
-$without_glare = false
-$glare_server = "${vhost_name}:9494"
-$memcache_server = '127.0.0.1:11211'
-$repo_url = 'https://github.com/openstack/app-catalog.git'
-$commit = 'master'
-$use_ssl = false
-
-if $use_ssl {
- $glare_url = "https://${glare_server}"
-}else{
- $glare_url = "http://${glare_server}"
-}
-
-#installation with importing assets
-$import_assets = true
-
-class { '::apps_site':
- without_glare => $without_glare,
- use_pip => false,
- use_git => true,
- repo_url => $repo_url,
- commit => $commit,
-}
-
-class { '::apps_site::plugins::glare':
- use_ssl => $use_ssl,
- memcache_server => $memcache_server,
- vhost_name => $vhost_name,
-}
-
-class { '::apps_site::wsgi::apache':
- use_ssl => $use_ssl,
- servername => $vhost_name,
-}
-
-class { '::apps_site::catalog':
- import_assets => $import_assets,
- domain => $vhost_name,
- glare_url => $glare_url,
- memcache_server => $memcache_server,
-}
-
-Class['::apps_site']
--> Class['::apps_site::plugins::glare']
--> Class['::apps_site::wsgi::apache']
--> Class['::apps_site::catalog']
diff --git a/examples/app_site_with_glare_using_pip.pp b/examples/app_site_with_glare_using_pip.pp
deleted file mode 100644
index 38a3034..0000000
--- a/examples/app_site_with_glare_using_pip.pp
+++ /dev/null
@@ -1,42 +0,0 @@
-#if you want to install app_site with glare support via pip, memcache installed on localhost
-$vhost_name = $::fqdn
-$without_glare = false
-$glare_server = "${vhost_name}:9494"
-$memcache_server = '127.0.0.1:11211'
-$use_ssl = false
-
-if $use_ssl {
- $glare_url = "https://${glare_server}"
-}else{
- $glare_url = "http://${glare_server}"
-}
-
-#installation with importing assets
-$import_assets = true
-
-class { '::apps_site':
- without_glare => $without_glare,
-}
-
-class { '::apps_site::plugins::glare':
- use_ssl => $use_ssl,
- memcache_server => $memcache_server,
- vhost_name => $vhost_name,
-}
-
-class { '::apps_site::wsgi::apache':
- use_ssl => $use_ssl,
- servername => $vhost_name,
-}
-
-class { '::apps_site::catalog':
- import_assets => $import_assets,
- domain => $vhost_name,
- glare_url => $glare_url,
- memcache_server => $memcache_server,
-}
-
-Class['::apps_site']
--> Class['::apps_site::plugins::glare']
--> Class['::apps_site::wsgi::apache']
--> Class['::apps_site::catalog']
diff --git a/examples/app_site_without_glare.pp b/examples/app_site_without_glare.pp
deleted file mode 100644
index 88648c7..0000000
--- a/examples/app_site_without_glare.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-#if you want to install app_site without glare support
-$vhost_name = $::fqdn
-$without_glare = true
-
-class { '::apps_site':
- vhost_name => $vhost_name,
- without_glare => $without_glare,
-}
diff --git a/manifests/catalog.pp b/manifests/catalog.pp
deleted file mode 100644
index f05c651..0000000
--- a/manifests/catalog.pp
+++ /dev/null
@@ -1,56 +0,0 @@
-# class: apps_site::catalog
-#
-
-class apps_site::catalog (
- $settings_dir = '/etc/openstack-catalog',
- $memcache_server = '127.0.0.1:11211',
- $domain = $::fqdn,
- $assets_file = undef,
- $import_assets = true,
- $glare_url = 'http://127.0.0.1:9494/'
-) {
-
- #settings_dir should be set /etc/openstack-catalog
- #currently app-catalog will not use env variables properly
- file { $settings_dir:
- ensure => 'directory',
- }
-
- file { "${settings_dir}/local_settings.py":
- ensure => 'present',
- content => template('apps_site/local_settings_glare.erb'),
- require => File[$settings_dir],
- }
-
- exec { 'app-catalog-collect-static' :
- command => 'app-catalog-manage collectstatic --noinput',
- path => ['/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/', '/usr/local/bin', '/usr/local/sbin'],
- refreshonly => true,
- subscribe => [Package['openstack-app-catalog'], File["${settings_dir}/local_settings.py"]],
- }
-
- exec { 'app-catalog-compress' :
- command => 'app-catalog-manage compress --force',
- path => ['/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/', '/usr/local/bin', '/usr/local/sbin'],
- refreshonly => true,
- subscribe => [Package['openstack-app-catalog'], File["${settings_dir}/local_settings.py"]],
- }
-
- if $import_assets {
-
- $real_assets_file = $assets_file ? {
- undef => "${apps_site::params::app_catalog_dir}/web/static/assets.yaml",
- default => $assets_file,
- }
-
- exec { 'import-glare-assets' :
- command => "app-catalog-import-assets --glare_url ${glare_url} --assets_file ${real_assets_file}",
- path => ['/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/', '/usr/local/bin', '/usr/local/sbin'],
- refreshonly => true,
- try_sleep => 5,
- tries => 10,
- logoutput => on_failure,
- require => [Package['openstack-app-catalog'], Exec['app-catalog-compress']],
- }
- }
-}
diff --git a/manifests/init.pp b/manifests/init.pp
deleted file mode 100644
index 5906f71..0000000
--- a/manifests/init.pp
+++ /dev/null
@@ -1,198 +0,0 @@
-# == Class: apps_site
-#
-class apps_site (
- $commit = 'master',
- $install_dir = '/usr/local/lib/python2.7/dist-packages/openstack_catalog/',
- $root_dir = '/opt/apps_site',
- $serveradmin = "webmaster@${::domain}",
- $ssl_cert_file_contents = undef,
- $ssl_key_file_contents = undef,
- $ssl_chain_file_contents = undef,
- $ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem',
- $ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key',
- $ssl_chain_file = '/etc/ssl/certs/ca-certificates.crt',
- $vhost_name = $::fqdn,
- $without_glare = true,
- $use_pip = true,
- $use_git = false,
- $repo_url = 'https://git.openstack.org/openstack/app-catalog.git',
-) {
-
- if ($without_glare) {
- include ::httpd::ssl
- include ::httpd::mod::wsgi
-
- if !defined(Package['git']) {
- package { 'git':
- ensure => present
- }
- }
-
- vcsrepo { $root_dir:
- ensure => latest,
- provider => git,
- revision => $commit,
- source => 'https://git.openstack.org/openstack/app-catalog.git',
- require => [
- Package['git'],
- ]
- }
-
- ::httpd::vhost { $vhost_name:
- port => 443,
- docroot => "${root_dir}/openstack_catalog/web",
- priority => '50',
- template => 'apps_site/vhost.erb',
- vhost_name => $vhost_name,
- ssl => true,
- }
-
- httpd_mod { 'headers':
- ensure => present,
- notify => Service['httpd']
- }
-
- httpd_mod { 'rewrite':
- ensure => present,
- notify => Service['httpd']
- }
-
- httpd_mod { 'deflate':
- ensure => present,
- notify => Service['httpd']
- }
-
- if $ssl_cert_file_contents != undef {
- file { $ssl_cert_file:
- owner => 'root',
- group => 'root',
- mode => '0640',
- content => $ssl_cert_file_contents,
- before => Httpd::Vhost[$vhost_name],
- }
- }
-
- if $ssl_key_file_contents != undef {
- file { $ssl_key_file:
- owner => 'root',
- group => 'ssl-cert',
- mode => '0640',
- content => $ssl_key_file_contents,
- before => Httpd::Vhost[$vhost_name],
- }
- }
-
- if $ssl_chain_file_contents != undef {
- file { $ssl_chain_file:
- owner => 'root',
- group => 'root',
- mode => '0640',
- content => $ssl_chain_file_contents,
- before => Httpd::Vhost[$vhost_name],
- }
- }
-
- if ! defined(Package['python-yaml']) {
- package { 'python-yaml':
- ensure => present,
- }
- }
-
- exec { 'install-app_catalog' :
- command => "/usr/local/bin/pip install --upgrade ${root_dir}",
- cwd => $root_dir,
- refreshonly => true,
- subscribe => Vcsrepo[$root_dir],
- notify => Service['httpd'],
- }
-
- file { "${install_dir}/local_settings.py":
- ensure => present,
- mode => '0644',
- require => Exec['install-app_catalog'],
- content => template('apps_site/local_settings.erb'),
- }
-
- file { "${install_dir}/manage.py":
- ensure => present,
- source => "${root_dir}/manage.py",
- require => Exec['install-app_catalog'],
- }
-
- exec { 'collect-static' :
- command => "/usr/bin/python ${install_dir}/manage.py collectstatic --noinput",
- subscribe => File["${install_dir}/manage.py"],
- }
-
- exec { 'python-compress' :
- command => "/usr/bin/python ${install_dir}/manage.py compress --force",
- subscribe => File["${install_dir}/manage.py"],
- }
-
- exec { 'make_assets_json' :
- command => "${root_dir}/tools/update_assets.sh",
- path => '/usr/local/bin:/usr/bin:/bin',
- refreshonly => true,
- subscribe => Vcsrepo[$root_dir],
- }
- } else {
-
- $deps = [ 'python-pip', 'python-dev', 'libffi-dev', 'libpq-dev' ]
-
- package { $deps:
- ensure => 'present',
- before => Package['pipinpip'],
- }
-
- package { 'pipinpip':
- ensure => latest,
- name => 'pip',
- provider => 'pip',
- before => Package['openstack-app-catalog'],
- }
-
- if $use_pip {
- if ! defined(Package['openstack-app-catalog']) {
- package {'openstack-app-catalog':
- ensure => 'latest',
- provider => pip,
- }
- }
- }
-
- if $use_git {
-
- if !defined(Package['git']) {
- package { 'git':
- ensure => present
- }
- }
-
- if ! defined(Package['openstack-app-catalog']) {
- package {'openstack-app-catalog':
- ensure => 'latest',
- provider => pip,
- source => "git+${repo_url}@${commit}",
- }
- }
- }
- }
-
- if ! defined(Package['python-dateutil']) {
- package { 'python-dateutil':
- ensure => present,
- }
- }
-
- if ($::lsbdistcodename == 'trusty') {
- if ! defined(Package['zopfli']) {
- if (!$without_glare){
- Package['openstack-app-catalog'] -> Package['zopfli']
- }
-
- package { 'zopfli':
- ensure => present,
- }
- }
- }
-}
diff --git a/manifests/params.pp b/manifests/params.pp
deleted file mode 100644
index 8b8e0f0..0000000
--- a/manifests/params.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-class apps_site::params {
- $wsgi_processes = 2
- $wsgi_threads = 4
-
- case $::osfamily {
- 'Debian': {
- $wsgi_user = 'www-data'
- $wsgi_group = 'www-data'
- $app_catalog_dir = '/usr/local/lib/python2.7/dist-packages/openstack_catalog'
- }
- default: {
- fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem} module: ${module_name}")
- }
- }
-}
diff --git a/manifests/plugins/glare.pp b/manifests/plugins/glare.pp
deleted file mode 100644
index ca400f7..0000000
--- a/manifests/plugins/glare.pp
+++ /dev/null
@@ -1,126 +0,0 @@
-# class: apps_site::plugins::glare
-#
-class apps_site::plugins::glare (
- $vhost_name = $::fqdn,
- $memcache_server = '127.0.0.1:11211',
- $memcached_listen_ip = '127.0.0.1',
- $cookie_name = 's.aoo',
- $use_ssl = false,
- $ssl_cert_file_content = undef,
- $ssl_key_file_content = undef,
- $ssl_ca_file_content = undef,
- $ssl_cert_file_location = '/etc/ssl/certs/ssl-cert-snakeoil.pem',
- $ssl_key_file_location = '/etc/ssl/private/ssl-cert-snakeoil.key',
- $ssl_ca_file_location = '/etc/ssl/certs/ca-certificates.crt',
- $extra_params = '--config-file /usr/local/etc/glare/glare.conf'
-) inherits ::apps_site::params {
-
- class { '::memcached':
- listen_ip => $memcached_listen_ip,
- }
-
- package { 'glare_dev':
- ensure => present,
- provider => 'pip',
- }
-
- service { 'glare-api':
- ensure => 'running',
- provider => base,
- start => "nohup glare-api ${extra_params} &",
- restart => "killall glare-api; nohup glare-api ${extra_params} &",
- stop => 'killall glare-api',
- }
-
- exec { 'glare-db-sync':
- command => "glare-db-manage ${extra_params} upgrade",
- path => [ '/bin/', '/usr/bin/' , '/usr/local/bin' ],
- refreshonly => true,
- try_sleep => 5,
- tries => 10,
- logoutput => on_failure,
- }
-
- Class['memcached']
- -> Package['glare_dev']
- ~> Exec['glare-db-sync']
- -> Service['glare-api']
-
-# include ::glare::params
-# include ::glare::db::sync
-#
-# if $use_ssl {
-# if $ssl_cert_file_content != undef {
-# file { $ssl_cert_file_location:
-# owner => 'root',
-# group => 'root',
-# mode => '0640',
-# content => $ssl_cert_file_content,
-# }
-# }
-#
-# if $ssl_key_file_content != undef {
-# file { $ssl_key_file_location:
-# owner => 'root',
-# group => 'ssl-cert',
-# mode => '0640',
-# content => $ssl_key_file_content,
-# }
-# }
-#
-# if $ssl_ca_file_content != undef {
-# file { $ssl_ca_file_location:
-# owner => 'root',
-# group => 'root',
-# mode => '0640',
-# content => $ssl_ca_file_content,
-# }
-# }
-# }
-#
-# #at the moment the package is located in the experimental repository
-# #for debian, should be removed when it will be switched to stable
-# if $::os_package_type == 'debian'{
-# Package<|title == 'glare'|> {
-# name => 'glare-api',
-# install_options => ['-t', 'experimental'],
-# }
-# }
-#
-# glare_paste_ini {
-# 'filter:session/paste.filter_factory':
-# value => 'openstack_app_catalog.middlewares:SessionMiddleware.factory';
-# 'filter:session/memcached_server':
-# value => $memcache_server;
-# 'filter:session/session_cookie_name':
-# value => $cookie_name;
-# 'filter:cors/allowed_origin':
-# value => "http://${vhost_name}";
-# }
-#
-# file { '/etc/glare/glare-policy.json':
-# content => "{\n \"context_is_admin\": \"role:app-catalog-core\" \n}",
-# require => Package[ 'glare' ],
-# }
-#
-# glare_config {
-# 'oslo_policy/policy_file': value => 'glare-policy.json';
-# }
-#
-# if $use_ssl {
-# class { '::glare':
-# pipeline => 'session',
-# allow_anonymous_access => true,
-# auth_strategy => 'none',
-# cert_file => $ssl_cert_file_location,
-# key_file => $ssl_key_file_location,
-# ca_file => $ssl_ca_file_location,
-# }
-# }else{
-# class { '::glare':
-# pipeline => 'session',
-# allow_anonymous_access => true,
-# auth_strategy => 'none',
-# }
-# }
-}
diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
deleted file mode 100644
index 5b67e2f..0000000
--- a/manifests/wsgi/apache.pp
+++ /dev/null
@@ -1,135 +0,0 @@
-# == Class: apps_site::wsgi::apache
-#
-class apps_site::wsgi::apache (
- $servername = $::fqdn,
- $http_port = 80,
- $https_port = 443,
- $ssl_cert_file_content = undef,
- $ssl_key_file_content = undef,
- $ssl_ca_file_content = undef,
- $ssl_cert_file_location = '/etc/ssl/certs/ssl-cert-snakeoil.pem',
- $ssl_key_file_location = '/etc/ssl/private/ssl-cert-snakeoil.key',
- $ssl_ca_file_location = '/etc/ssl/certs/ca-certificates.crt',
- $use_ssl = false,
- $bind_ip = undef,
- $settings_dir = '/etc/openstack-catalog',
-) inherits ::apps_site::params {
-
- class { '::apache':
- default_vhost => false,
- }
-
- if $use_ssl {
- include ::apache::mod::ssl
-
- if $ssl_cert_file_content != undef {
- file { $ssl_cert_file_location:
- owner => 'root',
- group => 'root',
- mode => '0640',
- content => $ssl_cert_file_content,
- before => Apache::Vhost['openstack-app-catalog-ssl'],
- }
- }
-
- if $ssl_key_file_content != undef {
- file { $ssl_key_file_location:
- owner => 'root',
- group => 'ssl-cert',
- mode => '0640',
- content => $ssl_key_file_content,
- before => Apache::Vhost['openstack-app-catalog-ssl'],
- }
- }
-
- if $ssl_ca_file_content != undef {
- file { $ssl_ca_file_location:
- owner => 'root',
- group => 'root',
- mode => '0640',
- content => $ssl_ca_file_content,
- before => Apache::Vhost['openstack-app-catalog-ssl'],
- }
- }
-
- ::apache::vhost { 'openstack-app-catalog-ssl':
- ensure => 'present',
- ssl => true,
- servername => $servername,
- port => $https_port,
- ip => $bind_ip,
- docroot => '/var/www',
- priority => '50',
- access_log_file => 'app_catalog_ssl_access.log',
- error_log_file => 'app_catalog_ssl_error.log',
- ssl_cert => $ssl_cert_file_location,
- ssl_key => $ssl_key_file_location,
- ssl_ca => $ssl_ca_file_location,
- setenv => ["LOCAL_SETTINGS_PATH ${settings_dir}"],
- aliases => [{
- alias => '/static',
- path => "${apps_site::params::app_catalog_dir}/web/static",
- }],
- wsgi_script_aliases => hash(['/', "${apps_site::params::app_catalog_dir}/wsgi.py"]),
- wsgi_daemon_process => "${apps_site::params::wsgi_group}-ssl",
- wsgi_process_group => "${apps_site::params::wsgi_group}-ssl",
- wsgi_daemon_process_options => {
- processes => $apps_site::params::wsgi_processes,
- threads => $apps_site::params::wsgi_threads,
- user => $apps_site::params::wsgi_user,
- group => $apps_site::params::wsgi_group,
- },
- }
-
- ::apache::vhost { 'openstack-app-catalog':
- servername => $servername,
- port => $http_port,
- ip => $bind_ip,
- redirect_status => 'permanent',
- redirect_dest => "https://${servername}/",
- docroot => '/var/www',
- priority => '50',
- access_log_file => 'app_catalog_access.log',
- error_log_file => 'app_catalog_error.log',
- setenv => ["LOCAL_SETTINGS_PATH ${settings_dir}"],
- aliases => [{
- alias => '/static',
- path => "${apps_site::params::app_catalog_dir}/web/static",
- }],
- wsgi_script_aliases => hash(['/', "${apps_site::params::app_catalog_dir}/wsgi.py"]),
- wsgi_daemon_process => $apps_site::params::wsgi_group,
- wsgi_process_group => $apps_site::params::wsgi_group,
- wsgi_daemon_process_options => {
- processes => $apps_site::params::wsgi_processes,
- threads => $apps_site::params::wsgi_threads,
- user => $apps_site::params::wsgi_user,
- group => $apps_site::params::wsgi_group,
- },
- }
- }else{
-
- ::apache::vhost { 'openstack-app-catalog':
- servername => $servername,
- port => $http_port,
- ip => $bind_ip,
- docroot => '/var/www',
- priority => '50',
- access_log_file => 'app_catalog_access.log',
- error_log_file => 'app_catalog_error.log',
- setenv => ["LOCAL_SETTINGS_PATH ${settings_dir}"],
- aliases => [{
- alias => '/static',
- path => "${apps_site::params::app_catalog_dir}/web/static",
- }],
- wsgi_script_aliases => hash(['/', "${apps_site::params::app_catalog_dir}/wsgi.py"]),
- wsgi_daemon_process => $apps_site::params::wsgi_group,
- wsgi_process_group => $apps_site::params::wsgi_group,
- wsgi_daemon_process_options => {
- processes => $apps_site::params::wsgi_processes,
- threads => $apps_site::params::wsgi_threads,
- user => $apps_site::params::wsgi_user,
- group => $apps_site::params::wsgi_group,
- },
- }
- }
-}
diff --git a/metadata.json b/metadata.json
deleted file mode 100644
index b348a97..0000000
--- a/metadata.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "name": "openstackci-apps_site",
- "version": "0.0.1",
- "author": "OpenStack CI",
- "summary": "Puppet module for OpenStack App Catalog",
- "license": "Apache 2.0",
- "source": "git://git.openstack.org/openstack-infra/puppet-apps_site.git",
- "project_page": "http://docs.openstack.org/infra/system-config",
- "issues_url": "https://storyboard.openstack.org/#!/project/817",
- "dependencies": [
- { "name": "openstackinfra/vcsrepo","version_requirement":">= 0.0.8"},
- { "name": "openstackinfra/httpd", "version_requirement": "0.x" },
- { "name": "puppetlabs/apache", "version_requirement": ">=1.6.0" },
- { "name": "saz/memcached", "version_requirement": ">=2.7.1" }
- ]
-}
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index 3bb3e62..0000000
--- a/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
- ubuntu-server-1404-x64:
- roles:
- - master
- platform: ubuntu-14.04-amd64
- box: puppetlabs/ubuntu-14.04-64-nocm
- box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
- hypervisor: vagrant
-CONFIG:
- log_level: debug
- type: git
diff --git a/spec/acceptance/nodesets/nodepool-centos7.yml b/spec/acceptance/nodesets/nodepool-centos7.yml
deleted file mode 100644
index e9457d5..0000000
--- a/spec/acceptance/nodesets/nodepool-centos7.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
- centos-70-x64:
- roles:
- - master
- platform: 7-x86_64
- hypervisor: none
- ip: 127.0.0.1
-CONFIG:
- type: foss
- set_env: false
diff --git a/spec/acceptance/nodesets/nodepool-trusty.yml b/spec/acceptance/nodesets/nodepool-trusty.yml
deleted file mode 100644
index 9fc624e..0000000
--- a/spec/acceptance/nodesets/nodepool-trusty.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
- ubuntu-14.04-amd64:
- roles:
- - master
- platform: ubuntu-14.04-amd64
- hypervisor: none
- ip: 127.0.0.1
-CONFIG:
- type: foss
- set_env: false
diff --git a/spec/acceptance/nodesets/nodepool-xenial.yml b/spec/acceptance/nodesets/nodepool-xenial.yml
deleted file mode 100644
index 99dd318..0000000
--- a/spec/acceptance/nodesets/nodepool-xenial.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
- ubuntu-16.04-amd64:
- roles:
- - master
- platform: ubuntu-16.04-amd64
- hypervisor: none
- ip: 127.0.0.1
-CONFIG:
- type: foss
- set_env: false
diff --git a/templates/local_settings.erb b/templates/local_settings.erb
deleted file mode 100644
index 4f99304..0000000
--- a/templates/local_settings.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-ASSETS_FILE = '<%= @root_dir %>/openstack_catalog/web/api/v1/assets'
-STATIC_ROOT = '<%= @install_dir %>/web/static'
-ALLOWED_HOSTS = ['*']
-DEBUG = False
-COMPRESS_ENABLED = True
-COMPRESS_OFFLINE = True
diff --git a/templates/local_settings_glare.erb b/templates/local_settings_glare.erb
deleted file mode 100644
index 0d362ae..0000000
--- a/templates/local_settings_glare.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-DEBUG = False
-COMPRESS_ENABLED = True
-COMPRESS_OFFLINE = True
-ALLOWED_HOSTS = ['*']
-DOMAIN = '<%= @domain %>'
-BASE_URL = 'http://<%= @domain %>'
-OPENID_RETURN_URL = 'http://<%= @domain %>/auth/process'
-MEMCACHED_SERVER = '<%= @memcache_server %>'
-GLARE_URL = '<%= @glare_url %>'
diff --git a/templates/vhost.erb b/templates/vhost.erb
deleted file mode 100644
index 9e798cd..0000000
--- a/templates/vhost.erb
+++ /dev/null
@@ -1,84 +0,0 @@
-
- ServerAdmin <%= @serveradmin %>
- ServerName <%= @vhost_name %>
-
- WSGIProcessGroup appcatalog
- WSGIDaemonProcess appcatalog user=www-data group=www-data threads=5 python-path=/usr/lib/python2.7:/usr/lib/python2.7/plat-x86_64-linux-gnu:/usr/lib/python2.7/lib-tk:/usr/lib/python2.7/lib-old:/usr/lib/python2.7/lib-dynload:/usr/local/lib/python2.7/dist-packages:/usr/lib/python2.7/dist-packages
- WSGIScriptAlias / /usr/local/lib/python2.7/dist-packages/openstack_catalog/wsgi.py
-
- Alias /static/ <%= @install_dir %>/web/static/
-
- DocumentRoot <%= @docroot %>
-
- Options FollowSymLinks
- AllowOverride None
-
- >
- Allow from all
- Satisfy Any
-
-
- Order allow,deny
- Allow from all
- Satisfy Any
-
-
- ErrorLog /var/log/apache2/app_site-error.log
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel warn
-
- CustomLog /var/log/apache2/app_site-access.log combined
- ServerSignature Off
-
-
-
- ServerAdmin <%= @serveradmin %>
- ServerName <%= @vhost_name %>
-
- WSGIProcessGroup appcatalogssl
- WSGIDaemonProcess appcatalogssl user=www-data group=www-data threads=5 python-path=/usr/lib/python2.7:/usr/lib/python2.7/plat-x86_64-linux-gnu:/usr/lib/python2.7/lib-tk:/usr/lib/python2.7/lib-old:/usr/lib/python2.7/lib-dynload:/usr/local/lib/python2.7/dist-packages:/usr/lib/python2.7/dist-packages
- WSGIScriptAlias / /usr/local/lib/python2.7/dist-packages/openstack_catalog/wsgi.py
-
- Alias /static/ <%= @install_dir %>/web/static/
-
- SSLEngine on
- SSLProtocol All -SSLv2 -SSLv3
-
- SSLCertificateFile <%= @ssl_cert_file %>
- SSLCertificateKeyFile <%= @ssl_key_file %>
- <% if @ssl_chain_file != nil %>
- SSLCertificateChainFile <%= @ssl_chain_file %>
- <% end %>
-
- BrowserMatch "MSIE [2-6]" \
- nokeepalive ssl-unclean-shutdown \
- downgrade-1.0 force-response-1.0
- # MSIE 7 and newer should be able to use keepalive
- BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-
- DocumentRoot <%= @docroot %>
-
- Options FollowSymLinks
- AllowOverride None
-
- >
- Allow from all
- Satisfy Any
-
-
- Order allow,deny
- Allow from all
- Satisfy Any
-
-
- ErrorLog /var/log/apache2/app_site-error.log
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel warn
-
- CustomLog /var/log/apache2/app_site-access.log combined
- ServerSignature Off
-