From 9470460ef4cd367adc652bfd38146c7f87442ed9 Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Tue, 5 Apr 2022 19:29:20 -0500 Subject: [PATCH] Retire opendev/puppet-openstack_health: remove repo content openstack/health is retiring[1] so we need to retire the opendev/puppet-openstack_health module also. This removes the repo content and updates the README file. [1] https://review.opendev.org/c/openstack/governance/+/836706/2 Depends-On: https://review.opendev.org/c/openstack/project-config/+/836710 Change-Id: I66bb6e0df4a132352f0ebdd57393059061329fe2 --- .gitignore | 5 - Gemfile | 15 -- LICENSE | 202 ------------------ README.md | 19 -- README.rst | 10 + Rakefile | 8 - manifests/api.pp | 176 --------------- manifests/frontend.pp | 57 ----- manifests/init.pp | 27 --- manifests/site.pp | 38 ---- manifests/user.pp | 25 --- manifests/vhost.pp | 33 --- metadata.json | 31 --- spec/acceptance/api_spec.rb | 66 ------ spec/acceptance/fixtures/api.pp | 13 -- spec/acceptance/fixtures/frontend.pp | 12 -- spec/acceptance/frontend_spec.rb | 29 --- spec/acceptance/nodesets/default.yml | 11 - spec/acceptance/nodesets/nodepool-centos7.yml | 10 - spec/acceptance/nodesets/nodepool-trusty.yml | 10 - spec/acceptance/nodesets/nodepool-xenial.yml | 10 - templates/config.json.erb | 3 - templates/openstack-health-api.vhost.erb | 42 ---- templates/openstack-health-frontend.vhost.erb | 22 -- templates/openstack-health.conf.erb | 11 - 25 files changed, 10 insertions(+), 875 deletions(-) delete mode 100644 .gitignore delete mode 100644 Gemfile delete mode 100644 LICENSE delete mode 100644 README.md create mode 100644 README.rst delete mode 100644 Rakefile delete mode 100644 manifests/api.pp delete mode 100644 manifests/frontend.pp delete mode 100644 manifests/init.pp delete mode 100644 manifests/site.pp delete mode 100644 manifests/user.pp delete mode 100644 manifests/vhost.pp delete mode 100644 metadata.json delete mode 100644 spec/acceptance/api_spec.rb delete mode 100644 spec/acceptance/fixtures/api.pp delete mode 100644 spec/acceptance/fixtures/frontend.pp delete mode 100644 spec/acceptance/frontend_spec.rb delete mode 100644 spec/acceptance/nodesets/default.yml delete mode 100644 spec/acceptance/nodesets/nodepool-centos7.yml delete mode 100644 spec/acceptance/nodesets/nodepool-trusty.yml delete mode 100644 spec/acceptance/nodesets/nodepool-xenial.yml delete mode 100644 templates/config.json.erb delete mode 100644 templates/openstack-health-api.vhost.erb delete mode 100644 templates/openstack-health-frontend.vhost.erb delete mode 100644 templates/openstack-health.conf.erb diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 70813df..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -Gemfile.lock -.bundled_gems -log/ -junit/ -.vagrant/ diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 019213a..0000000 --- a/Gemfile +++ /dev/null @@ -1,15 +0,0 @@ -source 'https://rubygems.org' - -if File.exists?('/home/zuul/src/git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper') - gem_checkout_method = {:path => '/home/zuul/src/git.openstack.org/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 a1a8ab7..0000000 --- a/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# OpenStack Health Puppet Module - -## Overview - -This module provisions (OpenStack Health)[http://git.openstack.org/cgit/openstack/openstack-health]. - -## Running lint - -``` -$ bundle install -$ bundle exec rake lint -``` - -## Running acceptance tests - -``` -$ bundle install -$ bundle exec rspec spec/acceptance -``` diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..30392c8 --- /dev/null +++ b/README.rst @@ -0,0 +1,10 @@ +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 +service-discuss@lists.opendev.org or join #opendev on +OFTC. 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/manifests/api.pp b/manifests/api.pp deleted file mode 100644 index 19d2452..0000000 --- a/manifests/api.pp +++ /dev/null @@ -1,176 +0,0 @@ -# Install and maintain OpenStack Health. -# params: -# source_dir: -# The directory where the application will be running -# serveradmin: -# Used in the Apache virtual host, eg., openstack-health@openstack.org -# vhost_name: -# Used in the Apache virtual host, eg., health.openstack.org -# vhost_port: -# Used in the Apache virtual host, eg., 5000 -class openstack_health::api( - $db_uri = undef, - $source_dir = '/opt/openstack-health', - $server_admin = "webmaster@${::fqdn}", - $vhost_name = 'localhost', - $vhost_port = 5000, - $ignored_run_metadata_keys = undef, - $elastic_recheck_dir = '/opt/elastic-recheck', - $elastic_recheck_repo = 'https://git.openstack.org/openstack-infra/elastic-recheck', - $elastic_recheck_revision = 'master', - $cache_expiration = 900, -) { - - include ::httpd::mod::wsgi - - $default_ignored_run_metadata_keys = ['build_change', 'build_node', - 'build_patchset', 'build_ref', - 'build_short_uuid', 'build_uuid', - 'build_zuul_url', 'filename', - 'build_newrev'] - - if $ignored_run_metadata_keys { - # In case it was defined, ensure the value provided is an array - if is_array($ignored_run_metadata_keys) { - $ignored_keys = $ignored_run_metadata_keys - } else { - fail('$ignored_run_metadata_keys parameter should be an array of strings') - } - } else { - # In case it was not defined, use the default value - $ignored_keys = $default_ignored_run_metadata_keys - } - - $api_dir = "${source_dir}/openstack_health" - - class { '::python': - dev => true, - pip => true, - virtualenv => true, - version => 'system', - } - - class { '::memcached': - max_memory => '60%', - listen_ip => '127.0.0.1', - } - - vcsrepo { $elastic_recheck_dir : - ensure => latest, - owner => 'openstack_health', - group => 'openstack_health', - provider => git, - revision => $elastic_recheck_revision, - source => $elastic_recheck_repo, - require => Class['::openstack_health::user'], - } - - package {'apache2-utils': - ensure => present, - } - - case $::osfamily { - 'RedHat': { - package {'libffi-dev': - ensure => present, - name => 'libffi-devel', - } - } - default: { - package {'libffi-dev': - ensure => present, - } - } - } - - package {'libxml2-dev': - ensure => present, - } - - package {'libxslt1-dev': - ensure => present, - } - - package {'zlib1g-dev': - ensure => present, - } - - package {'libmemcached-dev': - ensure => present, - } - - package {'cython': - ensure => present, - } - - exec { 'requirements': - command => "pip install -U -r ${source_dir}/requirements.txt", - path => '/usr/local/bin:/usr/bin:/bin/', - require => [ - Package['libmemcached-dev'], - Package['cython'], - ], - subscribe => Vcsrepo[$source_dir], - refreshonly => true, - timeout => 1800, - } - - exec { 'elastic-recheck-install': - command => "pip install -U ${elastic_recheck_dir}", - path => '/usr/local/bin:/usr/bin:/bin/', - require => [ - Package['libffi-dev'], - ], - subscribe => Vcsrepo[$elastic_recheck_dir], - refreshonly => true, - timeout => 1800, - } - - exec { 'package-application': - command => "pip install -U ${source_dir}", - path => '/usr/local/bin:/usr/bin:/bin/', - refreshonly => true, - require => Exec['elastic-recheck-install'], - subscribe => Exec['requirements'], - } - - file { '/etc/openstack-health.conf': - ensure => present, - content => template('openstack_health/openstack-health.conf.erb'), - owner => 'openstack_health', - group => 'openstack_health', - mode => '0644', - subscribe => [ - Vcsrepo[$source_dir], - Vcsrepo[$elastic_recheck_dir], - ], - } - - ::httpd::vhost { "${vhost_name}-api": - docroot => 'MEANINGLESS ARGUMENT', - port => $vhost_port, - priority => '50', - ssl => false, - template => 'openstack_health/openstack-health-api.vhost.erb', - require => [ - File['/etc/openstack-health.conf'], - Exec['package-application'], - ], - } - if ! defined(Httpd::Mod['cache']) { - httpd::mod { 'cache': - ensure => present, - } - } - - if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '12.04' { - $cache_disk_module = 'disk_cache' - } else { - $cache_disk_module = 'cache_disk' - } - if ! defined(Httpd::Mod[$cache_disk_module]) { - httpd::mod { $cache_disk_module: - ensure => present, - } - } -} diff --git a/manifests/frontend.pp b/manifests/frontend.pp deleted file mode 100644 index eb2a5af..0000000 --- a/manifests/frontend.pp +++ /dev/null @@ -1,57 +0,0 @@ -# Install and maintain OpenStack Health. -# params: -# source_dir: -# The directory where the application will be running - -class openstack_health::frontend( - $api_endpoint, - $source_dir = '/opt/openstack-health', -) { - - class { '::nodejs': - repo_url_suffix => '6.x', - legacy_debian_symlinks => false, - } - - package { 'node-gyp': - ensure => present, - provider => npm, - require => Class['::nodejs'], - } - - package { 'gulp': - ensure => present, - provider => npm, - require => Class['::nodejs'], - } - - exec { 'install-frontend-requirements': - command => 'npm install', - cwd => $source_dir, - path => ['/usr/local/bin/', '/usr/bin/', '/bin/'], - timeout => 900, - require => [ - Package['gulp'], - Package['node-gyp'], - ], - subscribe => Vcsrepo[$source_dir], - } - - exec { 'build-static-files': - command => 'gulp prod', - cwd => $source_dir, - path => ['/usr/local/bin/', '/usr/bin/', '/bin/'], - require => Exec['install-frontend-requirements'], - subscribe => Vcsrepo[$source_dir], - } - - file { "${source_dir}/build/config.json": - ensure => present, - owner => 'openstack_health', - group => 'openstack_health', - mode => '0755', - content => template('openstack_health/config.json.erb'), - require => Exec['build-static-files'] - } - -} diff --git a/manifests/init.pp b/manifests/init.pp deleted file mode 100644 index cd7ea4a..0000000 --- a/manifests/init.pp +++ /dev/null @@ -1,27 +0,0 @@ -# Install and maintain OpenStack Health. -# params: -# source_dir: -# The directory where the application will be running -# git_source_repo: -# Source code repository -# git_revision: -# Branch or tag that will be deployed -class openstack_health( - $source_dir = '/opt/openstack-health', - $git_source_repo = 'https://git.openstack.org/openstack/openstack-health', - $git_revision = 'master', -) { - - include ::httpd - include ::openstack_health::user - - vcsrepo { $source_dir : - ensure => latest, - owner => 'openstack_health', - group => 'openstack_health', - provider => git, - revision => $git_revision, - source => $git_source_repo, - require => Class['::openstack_health::user'], - } -} diff --git a/manifests/site.pp b/manifests/site.pp deleted file mode 100644 index 29ccd25..0000000 --- a/manifests/site.pp +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (c) 2014 Hewlett-Packard Development Company, L.P. -# -# 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. -# -# == Define: openstack_health::site -# - -define openstack_health::site( - $httproot, - $api_endpoint = 'http://localhost:5000' -) { - - class { '::openstack_health::frontend': - api_endpoint => $api_endpoint - } - - file {$httproot: - ensure => directory, - owner => 'openstack_health', - group => 'openstack_health', - mode => '0644', - recurse => true, - purge => true, - force => true, - source => "${openstack_health::source_dir}/build", - require => Exec['build-static-files'] - } -} diff --git a/manifests/user.pp b/manifests/user.pp deleted file mode 100644 index 7837962..0000000 --- a/manifests/user.pp +++ /dev/null @@ -1,25 +0,0 @@ -# == Class: gerrit::user -# -class openstack_health::user { - group { 'openstack_health': - ensure => present, - } - - user { 'openstack_health': - ensure => present, - comment => 'Openstack-Health User', - home => '/home/openstack_health', - gid => 'openstack_health', - shell => '/bin/bash', - membership => 'minimum', - require => Group['openstack_health'], - } - - file { '/home/openstack_health': - ensure => directory, - owner => 'openstack_health', - group => 'openstack_health', - mode => '0644', - require => User['openstack_health'], - } -} diff --git a/manifests/vhost.pp b/manifests/vhost.pp deleted file mode 100644 index ddb45ee..0000000 --- a/manifests/vhost.pp +++ /dev/null @@ -1,33 +0,0 @@ -# Install and maintain OpenStack Health. -# params: -# serveradmin: -# Used in the Apache virtual host, eg., openstack-health@openstack.org -# vhost_name: -# Used in the Apache virtual host, eg., health.openstack.org -# vhost_port: -# Used in the Apache virtual host, eg., 5000 -# api_endpoint: -# The URL where openstack-health API is running -class openstack_health::vhost( - $serveradmin = "webmaster@${::fqdn}", - $vhost_name = 'localhost', - $vhost_port = 80, - $api_endpoint = 'http://localhost:5000', -) { - - class { '::openstack_health::frontend': - api_endpoint => $api_endpoint - } - - $frontend_dir = "${openstack_health::source_dir}/build" - - httpd::vhost { "${vhost_name}-frontend": - docroot => 'MEANINGLESS ARGUMENT', - vhost_name => $vhost_name, - port => $vhost_port, - priority => '100', - ssl => false, - template => 'openstack_health/openstack-health-frontend.vhost.erb', - require => Exec['build-static-files'], - } -} diff --git a/metadata.json b/metadata.json deleted file mode 100644 index 8eef9e3..0000000 --- a/metadata.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "openstackinfra-openstack_health", - "version": "0.0.1", - "author": "OpenStack Contributors", - "summary": "Puppet module for OpenStack Health", - "license": "Apache 2.0", - "source": "https://git.openstack.org/openstack-infra/puppet-openstack-health.git", - "project_page": "http://docs.openstack.org/infra/system-config/", - "issues_url": "", - "description": "Installs and configures OpenStack Health", - "operatingsystem_support": [ - { - "operatingsystem": "Debian", - "operatingsystemrelease": ["8"] - }, - { - "operatingsystem": "Ubuntu", - "operatingsystemrelease": ["14.04"] - }, - { - "operatingsystem": "Ubuntu", - "operatingsystemrelease": ["16.04"] - } - - ], - "dependencies": [ - {"name":"openstackinfra/vcsrepo","version_requirement":">= 0.0.8"}, - {"name":"saz/memcached","version_requirement":">= 2.8.1"}, - {"name":"puppet/nodejs","version_requirement":">= v2.3.0"} - ] -} diff --git a/spec/acceptance/api_spec.rb b/spec/acceptance/api_spec.rb deleted file mode 100644 index 4f7c52d..0000000 --- a/spec/acceptance/api_spec.rb +++ /dev/null @@ -1,66 +0,0 @@ -require 'puppet-openstack_infra_spec_helper/spec_helper_acceptance' - -describe 'puppet-openstack_health::api manifest', :if => ['debian', 'ubuntu'].include?(os[:family]) do - def pp_path - base_path = File.dirname(__FILE__) - File.join(base_path, 'fixtures') - end - - def api_puppet_module - module_path = File.join(pp_path, 'api.pp') - File.read(module_path) - end - - it 'should work with no errors' do - apply_manifest(api_puppet_module, catch_failures: true) - end - - describe 'required packages' do - describe 'os packages' do - required_packages = [ - package('apache2'), - package('python-dev'), - package('python-pip'), - package('python-virtualenv'), - ] - - required_packages.each do |package| - describe package do - it { should be_installed } - end - end - end - end - - describe 'required files' do - describe file('/opt/openstack-health') do - it { should be_directory } - it { should be_owned_by 'openstack_health' } - it { should be_grouped_into 'openstack_health' } - end - - describe file('/etc/openstack-health.conf') do - it { should be_file } - it { should be_owned_by 'openstack_health' } - it { should be_grouped_into 'openstack_health' } - its(:content) { should contain 'db_uri' } - its(:content) { should contain 'ignored_run_metadata_keys' } - its(:content) { should contain 'build_change' } - its(:content) { should contain 'build_zuul_url' } - end - end - - describe 'required services' do - describe 'ports are open and services are reachable' do - describe port(5000) do - it { should be_listening } - end - - describe command('curl http://localhost:5000/status --verbose') do - its(:stdout) { should contain('status') } - its(:stdout) { should contain('true') } - its(:stdout) { should_not contain('false') } - end - end - end -end diff --git a/spec/acceptance/fixtures/api.pp b/spec/acceptance/fixtures/api.pp deleted file mode 100644 index 6624004..0000000 --- a/spec/acceptance/fixtures/api.pp +++ /dev/null @@ -1,13 +0,0 @@ -$source_dir = '/opt/openstack-health' - -class { '::openstack_health': - source_dir => $source_dir, -} - -class { '::openstack_health::api': - db_uri => 'mysql+pymysql://query:query@logstash.openstack.org/subunit2sql', - source_dir => '/opt/openstack-health', - server_admin => 'webmaster@localhost', - vhost_name => 'localhost', - vhost_port => 5000, -} diff --git a/spec/acceptance/fixtures/frontend.pp b/spec/acceptance/fixtures/frontend.pp deleted file mode 100644 index 5f91cb8..0000000 --- a/spec/acceptance/fixtures/frontend.pp +++ /dev/null @@ -1,12 +0,0 @@ -$source_dir = '/opt/openstack-health' - -class { '::openstack_health': - source_dir => $source_dir, -} - -class { '::openstack_health::vhost': - serveradmin => "webmaster@${::fqdn}", - vhost_name => 'localhost', - vhost_port => 80, - api_endpoint => 'http://localhost:5000', -} diff --git a/spec/acceptance/frontend_spec.rb b/spec/acceptance/frontend_spec.rb deleted file mode 100644 index 24ec50f..0000000 --- a/spec/acceptance/frontend_spec.rb +++ /dev/null @@ -1,29 +0,0 @@ -require 'puppet-openstack_infra_spec_helper/spec_helper_acceptance' - -describe 'puppet-openstack_health::api manifest', :if => ['debian', 'ubuntu'].include?(os[:family]) do - def pp_path - base_path = File.dirname(__FILE__) - File.join(base_path, 'fixtures') - end - - def frontend_puppet_module - module_path = File.join(pp_path, 'frontend.pp') - File.read(module_path) - end - - it 'should work with no errors' do - apply_manifest(frontend_puppet_module, catch_failures: true) - end - - describe 'required services' do - describe 'ports are open and services are reachable' do - describe port(80) do - it { should be_listening } - end - - describe command('curl http://localhost --verbose') do - its(:stdout) { should contain('OpenStack Health') } - end - end - end -end 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 c552874..0000000 --- a/spec/acceptance/nodesets/nodepool-centos7.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-70-x64: - roles: - - master - platform: el-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/config.json.erb b/templates/config.json.erb deleted file mode 100644 index 20bf73b..0000000 --- a/templates/config.json.erb +++ /dev/null @@ -1,3 +0,0 @@ -{ - "apiRoot": "<%= @api_endpoint %>" -} diff --git a/templates/openstack-health-api.vhost.erb b/templates/openstack-health-api.vhost.erb deleted file mode 100644 index 8c6c3cd..0000000 --- a/templates/openstack-health-api.vhost.erb +++ /dev/null @@ -1,42 +0,0 @@ -<% unless [443, 80].include?(scope.lookupvar("openstack_health::api::vhost_port").to_i) %> -Listen <%= scope.lookupvar("openstack_health::api::vhost_port") %> -<% end %> -> - ServerName <%= scope.lookupvar("openstack_health::api::vhost_name") %> - ServerAdmin <%= scope.lookupvar("openstack_health::api::server_admin") %> - - LogLevel info - CustomLog ${APACHE_LOG_DIR}/openstack-health-api-access.log combined - ErrorLog ${APACHE_LOG_DIR}/openstack-health-api-error.log - - WSGIDaemonProcess flask user=openstack_health group=openstack_health threads=5 home=<%= scope.lookupvar("openstack_health::api::source_dir") %> - WSGIScriptAlias / /usr/local/bin/openstack-health - - - WSGIProcessGroup flask - WSGIApplicationGroup %{GLOBAL} - WSGIScriptReloading On - - Order allow,deny - Allow from all - = 2.4> - Require all granted - - - - - <% if @operatingsystem == "Ubuntu" and @operatingsystemrelease == "12.04" %> - - <% else %> - - <% end %> - CacheRoot "/var/cache/apache2/mod_disk_cache" - CacheEnable disk "/" - CacheDirLevels 5 - CacheDirLength 3 - CacheLock on - - - - DocumentRoot <%= scope.lookupvar("openstack_health::api::api_dir") %> - diff --git a/templates/openstack-health-frontend.vhost.erb b/templates/openstack-health-frontend.vhost.erb deleted file mode 100644 index d5bbd5f..0000000 --- a/templates/openstack-health-frontend.vhost.erb +++ /dev/null @@ -1,22 +0,0 @@ -<% unless [443, 80].include?(scope.lookupvar("::openstack_health::vhost::vhost_port").to_i) %> -Listen <%= scope.lookupvar("::openstack_health::vhost::vhost_port") %> -<% end %> -> - ServerName <%= scope.lookupvar("::openstack_health::vhost::vhost_name") %> - ServerAdmin <%= scope.lookupvar("::openstack_health::vhost::serveradmin") %> - - LogLevel info - CustomLog ${APACHE_LOG_DIR}/openstack-health-frontend-access.log combined - ErrorLog ${APACHE_LOG_DIR}/openstack-health-frontend-error.log - - > - Order allow,deny - Allow from all - = 2.4> - Require all granted - - - - DocumentRoot <%= scope.lookupvar('::openstack_health::vhost::frontend_dir') %> - DirectoryIndex index.html - diff --git a/templates/openstack-health.conf.erb b/templates/openstack-health.conf.erb deleted file mode 100644 index 9182d72..0000000 --- a/templates/openstack-health.conf.erb +++ /dev/null @@ -1,11 +0,0 @@ -[default] -query_dir = <%= @elastic_recheck_dir %>/queries -cache_expiration = <%= @cache_expiration %> -cache_url = 127.0.0.1 -db_uri = <%= scope.lookupvar("openstack_health::api::db_uri") %> -<% if @ignored_keys.length > 0 -%> -ignored_run_metadata_keys = - <% @ignored_keys.each do |ignored_key| -%> - <%= ignored_key %> - <% end -%> -<% end -%>