diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 2850371..0000000 --- a/.gitignore +++ /dev/null @@ -1,26 +0,0 @@ -# Add patterns in here to exclude files created by tools integrated with this -# repository, such as test frameworks from the project's recommended workflow, -# rendered documentation and package builds. -# -# Don't add patterns to exclude files created by preferred personal tools -# (editors, IDEs, your operating system itself even). These should instead be -# maintained outside the repository, for example in a ~/.gitignore file added -# with: -# -# git config --global core.excludesfile '~/.gitignore' - -pkg/ -Gemfile.lock -vendor/ -spec/fixtures/ -.vagrant/ -.bundle/ -coverage/ -.idea/ -*.iml -/openstack -/log - -# Files created by releasenotes build -releasenotes/build -.tox diff --git a/.zuul.yaml b/.zuul.yaml deleted file mode 100644 index 1444880..0000000 --- a/.zuul.yaml +++ /dev/null @@ -1,8 +0,0 @@ -- project: - templates: - - puppet-openstack-check-jobs - - puppet-openstack-module-unit-jobs - # TODO(aschultz): revert this once we have psycopg2 > 2.7 in centos - # https://review.opendev.org/#/c/629691/ - #- puppet-openstack-beaker-jobs - - release-notes-jobs-python3 diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst deleted file mode 100644 index 14622f0..0000000 --- a/CONTRIBUTING.rst +++ /dev/null @@ -1,19 +0,0 @@ -The source repository for this project can be found at: - - https://opendev.org/openstack/puppet-congress - -Pull requests submitted through GitHub are not monitored. - -To start contributing to OpenStack, follow the steps in the contribution guide -to set up and use Gerrit: - - https://docs.openstack.org/contributors/code-and-documentation/quick-start.html - -Bugs should be filed on Launchpad: - - https://bugs.launchpad.net/puppet-congress - -For more specific information about contributing to this repository, see the -Puppet OpenStack contributor guide: - - https://docs.openstack.org/puppet-openstack-guide/latest/contributor/contributing.html diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 8c7a257..0000000 --- a/Gemfile +++ /dev/null @@ -1,27 +0,0 @@ -source ENV['GEM_SOURCE'] || "https://rubygems.org" - -group :development, :test, :system_tests do - if ENV['ZUUL_PROJECT'] == 'openstack/puppet-openstack_spec_helper' - gem 'puppet-openstack_spec_helper', - :path => '../..', - :require => 'false' - else - gem 'puppet-openstack_spec_helper', - :git => 'https://opendev.org/openstack/puppet-openstack_spec_helper', - :require => 'false' - end -end - -if facterversion = ENV['FACTER_GEM_VERSION'] - gem 'facter', facterversion, :require => false -else - gem 'facter', :require => false -end - -if puppetversion = ENV['PUPPET_GEM_VERSION'] - gem 'puppet', puppetversion, :require => false -else - gem 'puppet', :require => false -end - -# vim:ft=ruby diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 68c771a..0000000 --- a/LICENSE +++ /dev/null @@ -1,176 +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. - diff --git a/README.md b/README.md deleted file mode 100644 index dcbda31..0000000 --- a/README.md +++ /dev/null @@ -1,98 +0,0 @@ -Team and repository tags -======================== - -[![Team and repository tags](https://governance.openstack.org/tc/badges/puppet-congress.svg)](https://governance.openstack.org/tc/reference/tags/index.html) - - - -congress -======= - -#### Table of Contents - -1. [Overview - What is the congress module?](#overview) -2. [Module Description - What does the module do?](#module-description) -3. [Setup - The basics of getting started with congress](#setup) -4. [Implementation - An under-the-hood peek at what the module is doing](#implementation) -5. [Limitations - OS compatibility, etc.](#limitations) -6. [Beaker-Rspec - Beaker-rspec tests for the project](#beaker-rspec) -7. [Development - Guide for contributing to the module](#development) -8. [Contributors - Those with commits](#contributors) - -Overview --------- - -The congress module is a part of [OpenStack](https://opendev.org/openstack), an effort by the OpenStack infrastructure team to provide continuous integration testing and code review for OpenStack and OpenStack community projects not part of the core software. The module its self is used to flexibly configure and manage the policy service for OpenStack. - -Module Description ------------------- - -The congress module is a thorough attempt to make Puppet capable of managing the entirety of congress. This includes manifests to provision region specific endpoint and database connections. Types are shipped as part of the congress module to assist in manipulation of configuration files. - -Setup ------ - -**What the congress module affects** - -* [Congress](https://docs.openstack.org/congress/latest/), the policy service for OpenStack. - -### Installing congress - - congress is not currently in Puppet Forge, but is anticipated to be added soon. Once that happens, you'll be able to install congress with: - puppet module install openstack/congress - -### Beginning with congress - -To utilize the congress module's functionality you will need to declare multiple resources. - -Implementation --------------- - -### congress - -congress is a combination of Puppet manifest and ruby code to delivery configuration and extra functionality through types and providers. - -Limitations ------------- - -* All the congress types use the CLI tools and so need to be ran on the congress node. - -Beaker-Rspec ------------- - -This module has beaker-rspec tests - -To run the tests on the default vagrant node: - -```shell -bundle install -bundle exec rake acceptance -``` - -For more information on writing and running beaker-rspec tests visit the documentation: - -* https://github.com/puppetlabs/beaker-rspec/blob/master/README.md - -Development ------------ - -Developer documentation for the entire puppet-openstack project. - -* https://docs.openstack.org/puppet-openstack-guide/latest/ - -Contributors ------------- - -* https://github.com/openstack/puppet-congress/graphs/contributors - -Release Notes -------------- - -* https://docs.openstack.org/releasenotes/puppet-congress - -Repository ----------- - -* https://opendev.org/openstack/puppet-congress - - diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..7c77ce0 --- /dev/null +++ b/README.rst @@ -0,0 +1,8 @@ +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-discuss@lists.openstack.org +or join #openstack-dev on Freenode. diff --git a/Rakefile b/Rakefile deleted file mode 100644 index 168d108..0000000 --- a/Rakefile +++ /dev/null @@ -1 +0,0 @@ -require 'puppet-openstack_spec_helper/rake_tasks' diff --git a/bindep.txt b/bindep.txt deleted file mode 100644 index d6645f8..0000000 --- a/bindep.txt +++ /dev/null @@ -1,12 +0,0 @@ -# This is a cross-platform list tracking distribution packages needed by tests; -# see https://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] -puppet [build] diff --git a/doc/requirements.txt b/doc/requirements.txt deleted file mode 100644 index 44cb208..0000000 --- a/doc/requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -# This is required for the docs build jobs -sphinx>=2.0.0,!=2.1.0 # BSD -openstackdocstheme>=2.2.1 # Apache-2.0 - -# This is required for the releasenotes build jobs -reno>=3.1.0 # Apache-2.0 diff --git a/examples/init.pp b/examples/init.pp deleted file mode 100644 index 1b5d233..0000000 --- a/examples/init.pp +++ /dev/null @@ -1,12 +0,0 @@ -# The baseline for module testing used by Puppet Inc. is that each manifest -# should have a corresponding test manifest that declares that class or defined -# type. -# -# Tests are then run by using puppet apply --noop (to check for compilation -# errors and view a log of events) or by fully applying the test in a virtual -# environment (to compare the resulting system state to the desired state). -# -# Learn more about module testing here: -# https://puppet.com/docs/puppet/latest/bgtm.html#testing-your-module -# -include congress diff --git a/lib/puppet/provider/congress_api_paste_ini/ini_setting.rb b/lib/puppet/provider/congress_api_paste_ini/ini_setting.rb deleted file mode 100644 index 9523b28..0000000 --- a/lib/puppet/provider/congress_api_paste_ini/ini_setting.rb +++ /dev/null @@ -1,27 +0,0 @@ -Puppet::Type.type(:congress_api_paste_ini).provide( - :ini_setting, - :parent => Puppet::Type.type(:ini_setting).provider(:ruby) -) do - - def section - resource[:name].split('/', 2).first - end - - def setting - resource[:name].split('/', 2).last - end - - def separator - '=' - end - - def self.file_path - '/etc/congress/api-paste.ini' - end - - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - -end diff --git a/lib/puppet/provider/congress_config/ini_setting.rb b/lib/puppet/provider/congress_config/ini_setting.rb deleted file mode 100644 index 9aecd76..0000000 --- a/lib/puppet/provider/congress_config/ini_setting.rb +++ /dev/null @@ -1,10 +0,0 @@ -Puppet::Type.type(:congress_config).provide( - :ini_setting, - :parent => Puppet::Type.type(:openstack_config).provider(:ini_setting) -) do - - def self.file_path - '/etc/congress/congress.conf' - end - -end diff --git a/lib/puppet/type/congress_api_paste_ini.rb b/lib/puppet/type/congress_api_paste_ini.rb deleted file mode 100644 index 1d93492..0000000 --- a/lib/puppet/type/congress_api_paste_ini.rb +++ /dev/null @@ -1,52 +0,0 @@ -Puppet::Type.newtype(:congress_api_paste_ini) do - - ensurable - - newparam(:name, :namevar => true) do - desc 'Section/setting name to manage from /etc/congress/api-paste.ini' - newvalues(/\S+\/\S+/) - end - - newproperty(:value) do - desc 'The value of the setting to be defined.' - munge do |value| - value = value.to_s.strip - value.capitalize! if value =~ /^(true|false)$/i - value - end - - def is_to_s( currentvalue ) - if resource.secret? - return '[old secret redacted]' - else - return currentvalue - end - end - - def should_to_s( newvalue ) - if resource.secret? - return '[new secret redacted]' - else - return newvalue - end - end - end - - newparam(:secret, :boolean => true) do - desc 'Whether to hide the value from Puppet logs. Defaults to `false`.' - - newvalues(:true, :false) - - defaultto false - end - - newparam(:ensure_absent_val) do - desc 'A value that is specified as the value property will behave as if ensure => absent was specified' - defaultto('') - end - - autorequire(:anchor) do - ['congress::install::end'] - end - -end diff --git a/lib/puppet/type/congress_config.rb b/lib/puppet/type/congress_config.rb deleted file mode 100644 index 0ce5d33..0000000 --- a/lib/puppet/type/congress_config.rb +++ /dev/null @@ -1,53 +0,0 @@ -Puppet::Type.newtype(:congress_config) do - - ensurable - - newparam(:name, :namevar => true) do - desc 'Section/setting name to manage from congress.conf' - newvalues(/\S+\/\S+/) - end - - newproperty(:value) do - desc 'The value of the setting to be defined.' - munge do |value| - value = value.to_s.strip - value.capitalize! if value =~ /^(true|false)$/i - value - end - newvalues(/^[\S ]*$/) - - def is_to_s( currentvalue ) - if resource.secret? - return '[old secret redacted]' - else - return currentvalue - end - end - - def should_to_s( newvalue ) - if resource.secret? - return '[new secret redacted]' - else - return newvalue - end - end - end - - newparam(:secret, :boolean => true) do - desc 'Whether to hide the value from Puppet logs. Defaults to `false`.' - - newvalues(:true, :false) - - defaultto false - end - - newparam(:ensure_absent_val) do - desc 'A value that is specified as the value property will behave as if ensure => absent was specified' - defaultto('') - end - - autorequire(:anchor) do - ['congress::install::end'] - end - -end diff --git a/manifests/client.pp b/manifests/client.pp deleted file mode 100644 index 8c48121..0000000 --- a/manifests/client.pp +++ /dev/null @@ -1,24 +0,0 @@ -# -# Installs the congress python library. -# -# == parameters -# [*ensure*] -# (Optional) ensure state for pachage. -# Defaults to 'present' -# -class congress::client ( - $ensure = 'present' -) { - - include congress::deps - include congress::params - - package { 'python-congressclient': - ensure => $ensure, - name => $::congress::params::client_package_name, - tag => 'openstack', - } - - include '::openstacklib::openstackclient' - -} diff --git a/manifests/config.pp b/manifests/config.pp deleted file mode 100644 index 0949bab..0000000 --- a/manifests/config.pp +++ /dev/null @@ -1,38 +0,0 @@ -# == Class: congress::config -# -# This class is used to manage arbitrary congress configurations. -# -# === Parameters -# -# [*congress_config*] -# (optional) Allow configuration of arbitrary congress configurations. -# The value is an hash of congress_config resources. Example: -# { 'DEFAULT/foo' => { value => 'fooValue'}, -# 'DEFAULT/bar' => { value => 'barValue'} -# } -# In yaml format, Example: -# congress_config: -# DEFAULT/foo: -# value: fooValue -# DEFAULT/bar: -# value: barValue -# -# [*congress_api_paste_ini*] -# (optional) Allow configuration of /etc/congress/api-paste.ini options. -# -# NOTE: The configuration MUST NOT be already handled by this module -# or Puppet catalog compilation will fail with duplicate resources. -# -class congress::config ( - $congress_config = {}, - $congress_api_paste_ini = {}, -) { - - include congress::deps - - validate_legacy(Hash, 'validate_hash', $congress_config) - validate_legacy(Hash, 'validate_hash', $congress_api_paste_ini) - - create_resources('congress_config', $congress_config) - create_resources('congress_api_paste_ini', $congress_api_paste_ini) -} diff --git a/manifests/db.pp b/manifests/db.pp deleted file mode 100644 index 5c2ffa1..0000000 --- a/manifests/db.pp +++ /dev/null @@ -1,79 +0,0 @@ -# == Class: congress::db -# -# Configure the congress database -# -# === Parameters -# -# [*database_connection*] -# (Optional) Url used to connect to database. -# Defaults to "sqlite:////var/lib/congress/congress.sqlite". -# -# [*database_connection_recycle_time*] -# (Optional) Timeout when db connections should be reaped. -# Defaults to $::os_service_default -# -# [*database_db_max_retries*] -# (optional) Maximum retries in case of connection error or deadlock error -# before error is raised. Set to -1 to specify an infinite retry count. -# Defaults to $::os_service_default -# -# [*database_max_retries*] -# (Optional) Maximum number of database connection retries during startup. -# Setting -1 implies an infinite retry count. -# Defaults to $::os_service_default -# -# [*database_retry_interval*] -# (Optional) Interval between retries of opening a database connection. -# Defaults to $::os_service_default -# -# [*database_max_pool_size*] -# (Optional)Maximum number of SQL connections to keep open in a pool. -# Defaults to $::os_service_default -# -# [*database_max_overflow*] -# (Optional) If set, use this value for max_overflow with sqlalchemy. -# Defaults to $::os_service_default -# -# [*database_pool_timeout*] -# (Optional) If set, use this value for pool_timeout with SQLAlchemy. -# Defaults to $::os_service_default -# -# DEPRECATED PARAMETERS -# -# [*database_min_pool_size*] -# (Optional) Minimum number of SQL connections to keep open in a pool. -# Defaults to undef -# -class congress::db ( - $database_connection = 'sqlite:////var/lib/congress/congress.sqlite', - $database_connection_recycle_time = $::os_service_default, - $database_max_pool_size = $::os_service_default, - $database_db_max_retries = $::os_service_default, - $database_max_retries = $::os_service_default, - $database_retry_interval = $::os_service_default, - $database_max_overflow = $::os_service_default, - $database_pool_timeout = $::os_service_default, - # DEPRECATED PARAMETERS - $database_min_pool_size = undef, -) { - - include congress::deps - - if $database_min_pool_size { - warning('The database_min_pool_size parameter is deprecated, and will be removed in a future release.') - } - - validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection, - ['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?']) - - oslo::db { 'congress_config': - connection => $database_connection, - connection_recycle_time => $database_connection_recycle_time, - db_max_retries => $database_db_max_retries, - max_retries => $database_max_retries, - retry_interval => $database_retry_interval, - max_pool_size => $database_max_pool_size, - max_overflow => $database_max_overflow, - pool_timeout => $database_max_overflow, - } -} diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp deleted file mode 100644 index 4aba5dc..0000000 --- a/manifests/db/mysql.pp +++ /dev/null @@ -1,64 +0,0 @@ -# The congress::db::mysql class implements mysql backend for congress -# -# This class can be used to create tables, users and grant -# privilege for a mysql congress database. -# -# == Parameters -# -# [*password*] -# (Required) Password to connect to the database. -# -# [*dbname*] -# (Optional) Name of the database. -# Defaults to 'congress'. -# -# [*user*] -# (Optional) User to connect to the database. -# Defaults to 'congress'. -# -# [*host*] -# (Optional) The default source host user is allowed to connect from. -# Defaults to '127.0.0.1' -# -# [*allowed_hosts*] -# (Optional) Other hosts the user is allowed to connect from. -# Defaults to 'undef'. -# -# [*charset*] -# (Optional) The database charset. -# Defaults to 'utf8' -# -# [*collate*] -# (Optional) The database collate. -# Only used with mysql modules >= 2.2. -# Defaults to 'utf8_general_ci' -# -class congress::db::mysql( - $password, - $dbname = 'congress', - $user = 'congress', - $host = '127.0.0.1', - $charset = 'utf8', - $collate = 'utf8_general_ci', - $allowed_hosts = undef -) { - - include congress::deps - - validate_legacy(String, 'validate_string', $password) - - ::openstacklib::db::mysql { 'congress': - user => $user, - password => $password, - dbname => $dbname, - host => $host, - charset => $charset, - collate => $collate, - allowed_hosts => $allowed_hosts, - } - - Anchor['congress::db::begin'] - ~> Class['congress::db::mysql'] - ~> Anchor['congress::db::end'] - -} diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp deleted file mode 100644 index bc3deb8..0000000 --- a/manifests/db/postgresql.pp +++ /dev/null @@ -1,49 +0,0 @@ -# == Class: congress::db::postgresql -# -# Class that configures postgresql for congress -# Requires the Puppetlabs postgresql module. -# -# === Parameters -# -# [*password*] -# (Required) Password to connect to the database. -# -# [*dbname*] -# (Optional) Name of the database. -# Defaults to 'congress'. -# -# [*user*] -# (Optional) User to connect to the database. -# Defaults to 'congress'. -# -# [*encoding*] -# (Optional) The charset to use for the database. -# Default to undef. -# -# [*privileges*] -# (Optional) Privileges given to the database user. -# Default to 'ALL' -# -class congress::db::postgresql( - $password, - $dbname = 'congress', - $user = 'congress', - $encoding = undef, - $privileges = 'ALL', -) { - - include congress::deps - - ::openstacklib::db::postgresql { 'congress': - password => $password, - dbname => $dbname, - user => $user, - encoding => $encoding, - privileges => $privileges, - } - - Anchor['congress::db::begin'] - ~> Class['congress::db::postgresql'] - ~> Anchor['congress::db::end'] - -} diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp deleted file mode 100644 index ff61ada..0000000 --- a/manifests/db/sync.pp +++ /dev/null @@ -1,33 +0,0 @@ -# -# Class to execute congress-manage db_sync -# -# == Parameters -# -# [*user*] -# (Optional) User to run dbsync command. -# Defaults to 'congress' -# -class congress::db::sync( - $user = 'congress', -) { - - include congress::deps - - exec { 'congress-db-sync': - command => 'congress-db-manage --config-file /etc/congress/congress.conf upgrade head', - path => ['/bin', '/usr/bin'], - user => $user, - refreshonly => true, - try_sleep => 5, - tries => 10, - logoutput => 'on_failure', - subscribe => [ - Anchor['congress::install::end'], - Anchor['congress::config::end'], - Anchor['congress::dbsync::begin'] - ], - notify => Anchor['congress::dbsync::end'], - tag => 'openstack-db', - } - -} diff --git a/manifests/deps.pp b/manifests/deps.pp deleted file mode 100644 index f9bfc70..0000000 --- a/manifests/deps.pp +++ /dev/null @@ -1,39 +0,0 @@ -# == Class: congress::deps -# -# Congress anchors and dependency management -# -class congress::deps { - # Setup anchors for install, config and service phases of the module. These - # anchors allow external modules to hook the begin and end of any of these - # phases. Package or service management can also be replaced by ensuring the - # package is absent or turning off service management and having the - # replacement depend on the appropriate anchors. When applicable, end tags - # should be notified so that subscribers can determine if installation, - # config or service state changed and act on that if needed. - anchor { 'congress::install::begin': } - -> Package<| tag == 'congress-package'|> - ~> anchor { 'congress::install::end': } - -> anchor { 'congress::config::begin': } - -> Congress_config<||> - ~> anchor { 'congress::config::end': } - -> anchor { 'congress::db::begin': } - -> anchor { 'congress::db::end': } - ~> anchor { 'congress::dbsync::begin': } - -> anchor { 'congress::dbsync::end': } - ~> anchor { 'congress::service::begin': } - ~> Service<| tag == 'congress-service' |> - ~> anchor { 'congress::service::end': } - - # all db settings should be applied and all packages should be installed - # before dbsync starts - Oslo::Db<||> -> Anchor['congress::dbsync::begin'] - - # policy config should occur in the config block also. - Anchor['congress::config::begin'] - -> Openstacklib::Policy::Base<||> - ~> Anchor['congress::config::end'] - - # Installation or config changes will always restart services. - Anchor['congress::install::end'] ~> Anchor['congress::service::begin'] - Anchor['congress::config::end'] ~> Anchor['congress::service::begin'] -} diff --git a/manifests/init.pp b/manifests/init.pp deleted file mode 100644 index c45d1cb..0000000 --- a/manifests/init.pp +++ /dev/null @@ -1,317 +0,0 @@ -# == Class: congress -# -# This class is used to specify configuration parameters that are common -# across congress services. -# -# === Parameters -# -# [*default_transport_url*] -# (optional) Connection url for oslo messaging backend. An example rabbit url -# would be, rabbit://user:pass@host:port/virtual_host -# Defaults to $::os_service_default -# -# [*rpc_response_timeout*] -# (Optional) Seconds to wait for a response from a call. -# Defaults to $::os_service_default -# -# [*control_exchange*] -# (Optional) The default exchange under which topics are scoped. May be -# overridden by an exchange name specified in the transport_url -# option. -# Defaults to $::os_service_default -# -# [*notification_transport_url*] -# (optional) Connection url for oslo messaging notification backend. An -# example rabbit url would be, rabbit://user:pass@host:port/virtual_host -# Defaults to $::os_service_default -# -# [*notification_driver*] -# (Optional) Driver or drivers to handle sending notifications. -# Value can be a string or a list. -# Defaults to $::os_service_default -# -# [*notification_topics*] -# (optional) AMQP topic used for OpenStack notifications -# Defaults to ::os_service_default -# -# [*rabbit_heartbeat_timeout_threshold*] -# (optional) Number of seconds after which the RabbitMQ broker is considered -# down if the heartbeat keepalive fails. Any value >0 enables heartbeats. -# Heartbeating helps to ensure the TCP connection to RabbitMQ isn't silently -# closed, resulting in missed or lost messages from the queue. -# (Requires kombu >= 3.0.7 and amqp >= 1.4.0) -# Defaults to $::os_service_default -# -# [*rabbit_heartbeat_rate*] -# (optional) How often during the rabbit_heartbeat_timeout_threshold period to -# check the heartbeat on RabbitMQ connection. (i.e. rabbit_heartbeat_rate=2 -# when rabbit_heartbeat_timeout_threshold=60, the heartbeat will be checked -# every 30 seconds. -# Defaults to $::os_service_default -# -# [*rabbit_heartbeat_in_pthread*] -# (Optional) EXPERIMENTAL: Run the health check heartbeat thread -# through a native python thread. By default if this -# option isn't provided the health check heartbeat will -# inherit the execution model from the parent process. By -# example if the parent process have monkey patched the -# stdlib by using eventlet/greenlet then the heartbeat -# will be run through a green thread. -# Defaults to $::os_service_default -# -# [*rabbit_use_ssl*] -# (optional) Connect over SSL for RabbitMQ -# Defaults to $::os_service_default -# -# [*rabbit_ha_queues*] -# (optional) Use HA queues in RabbitMQ. (boolean value) -# Defaults to $::os_service_default -# -# [*kombu_ssl_ca_certs*] -# (optional) SSL certification authority file (valid only if SSL enabled). -# Defaults to $::os_service_default -# -# [*kombu_ssl_certfile*] -# (optional) SSL cert file (valid only if SSL enabled). -# Defaults to $::os_service_default -# -# [*kombu_ssl_keyfile*] -# (optional) SSL key file (valid only if SSL enabled). -# Defaults to $::os_service_default -# -# [*kombu_ssl_version*] -# (optional) SSL version to use (valid only if SSL enabled). -# Valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be -# available on some distributions. -# Defaults to $::os_service_default -# -# [*kombu_reconnect_delay*] -# (optional) How long to wait before reconnecting in response to an AMQP -# consumer cancel notification. -# Defaults to $::os_service_default -# -# [*kombu_failover_strategy*] -# (Optional) Determines how the next RabbitMQ node is chosen in case the one -# we are currently connected to becomes unavailable. Takes effect only if -# more than one RabbitMQ node is provided in config. (string value) -# Defaults to $::os_service_default -# -# [*kombu_compression*] -# (optional) Possible values are: gzip, bz2. If not set compression will not -# be used. This option may notbe available in future versions. EXPERIMENTAL. -# (string value) -# Defaults to $::os_service_default -# -# [*amqp_durable_queues*] -# (optional) Define queues as "durable" to rabbitmq. (boolean value) -# Defaults to $::os_service_default -# -# [*amqp_server_request_prefix*] -# (Optional) Address prefix used when sending to a specific server -# Defaults to $::os_service_default -# -# [*amqp_broadcast_prefix*] -# (Optional) address prefix used when broadcasting to all servers -# Defaults to $::os_service_default -# -# [*amqp_group_request_prefix*] -# (Optional) address prefix when sending to any server in group -# Defaults to $::os_service_default -# -# [*amqp_container_name*] -# (Optional) Name for the AMQP container -# Defaults to $::os_service_default -# -# [*amqp_idle_timeout*] -# (Optional) Timeout for inactive connections -# Defaults to $::os_service_default -# -# [*amqp_trace*] -# (Optional) Debug: dump AMQP frames to stdout -# Defaults to $::os_service_default -# -# [*amqp_ssl_ca_file*] -# (Optional) CA certificate PEM file to verify server certificate -# Defaults to $::os_service_default -# -# [*amqp_ssl_cert_file*] -# (Optional) Identifying certificate PEM file to present to clients -# Defaults to $::os_service_default -# -# [*amqp_ssl_key_file*] -# (Optional) Private key PEM file used to sign cert_file certificate -# Defaults to $::os_service_default -# -# [*amqp_ssl_key_password*] -# (Optional) Password for decrypting ssl_key_file (if encrypted) -# Defaults to $::os_service_default -# -# [*amqp_allow_insecure_clients*] -# (Optional) Accept clients using either SSL or plain TCP -# Defaults to $::os_service_default -# -# [*amqp_sasl_mechanisms*] -# (Optional) Space separated list of acceptable SASL mechanisms -# Defaults to $::os_service_default -# -# [*amqp_sasl_config_dir*] -# (Optional) Path to directory that contains the SASL configuration -# Defaults to $::os_service_default -# -# [*amqp_sasl_config_name*] -# (Optional) Name of configuration file (without .conf suffix) -# Defaults to $::os_service_default -# -# [*amqp_username*] -# (Optional) User name for message broker authentication -# Defaults to $::os_service_default -# -# [*amqp_password*] -# (Optional) Password for message broker authentication -# Defaults to $::os_service_default -# -# [*disabled_drivers*] -# (optional) Comma delimited list of disabled_drivers for congress. -# Defaults to $::os_service_default -# -# [*sync_db*] -# (Optional) Run db sync on the node. -# Defaults to true -# -# [*package_name*] -# (Optional) Package name to install for congress. -# Defaults to $::congress::params::package_name -# -# [*package_ensure*] -# (Optional) Ensure state for package. -# Defaults to present. -# -# DEPRECATED PARAMETERS -# -# [*drivers*] -# (optional) Comma delimited list of drivers for congress. -# Defaults to undef -# -# == Authors -# -# Dan Radez -# -# == Copyright -# -# Copyright 2016 Red Hat Inc, unless otherwise noted. -# -class congress( - $default_transport_url = $::os_service_default, - $rpc_response_timeout = $::os_service_default, - $control_exchange = $::os_service_default, - $notification_transport_url = $::os_service_default, - $notification_driver = $::os_service_default, - $notification_topics = $::os_service_default, - $rabbit_heartbeat_timeout_threshold = $::os_service_default, - $rabbit_heartbeat_rate = $::os_service_default, - $rabbit_heartbeat_in_pthread = $::os_service_default, - $rabbit_use_ssl = $::os_service_default, - $rabbit_ha_queues = $::os_service_default, - $kombu_ssl_ca_certs = $::os_service_default, - $kombu_ssl_certfile = $::os_service_default, - $kombu_ssl_keyfile = $::os_service_default, - $kombu_ssl_version = $::os_service_default, - $kombu_reconnect_delay = $::os_service_default, - $kombu_failover_strategy = $::os_service_default, - $kombu_compression = $::os_service_default, - $amqp_durable_queues = $::os_service_default, - $amqp_server_request_prefix = $::os_service_default, - $amqp_broadcast_prefix = $::os_service_default, - $amqp_group_request_prefix = $::os_service_default, - $amqp_container_name = $::os_service_default, - $amqp_idle_timeout = $::os_service_default, - $amqp_trace = $::os_service_default, - $amqp_ssl_ca_file = $::os_service_default, - $amqp_ssl_cert_file = $::os_service_default, - $amqp_ssl_key_file = $::os_service_default, - $amqp_ssl_key_password = $::os_service_default, - $amqp_allow_insecure_clients = $::os_service_default, - $amqp_sasl_mechanisms = $::os_service_default, - $amqp_sasl_config_dir = $::os_service_default, - $amqp_sasl_config_name = $::os_service_default, - $amqp_username = $::os_service_default, - $amqp_password = $::os_service_default, - $disabled_drivers = $::os_service_default, - $sync_db = true, - $package_name = $::congress::params::package_name, - $package_ensure = 'present', - # DEPRECATED PARAMETERS - $drivers = undef -) inherits congress::params { - - include congress::deps - - package { 'congress-common': - ensure => $package_ensure, - name => $package_name, - tag => ['openstack', 'congress-package'], - } - - if $drivers != undef { - warning('The congress::drivers parameter is deprecated and will be removed \ -in a future release. Use congress::disabled_drivers instead.') - congress_config { - 'DEFAULT/drivers' : value => join(any2array($drivers), ','); - } - } - - congress_config { - 'DEFAULT/disabled_drivers' : value => join(any2array($disabled_drivers), ','); - } - - if $sync_db { - include congress::db::sync - } - - oslo::messaging::rabbit {'congress_config': - rabbit_use_ssl => $rabbit_use_ssl, - heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, - heartbeat_rate => $rabbit_heartbeat_rate, - heartbeat_in_pthread => $rabbit_heartbeat_in_pthread, - kombu_reconnect_delay => $kombu_reconnect_delay, - kombu_failover_strategy => $kombu_failover_strategy, - amqp_durable_queues => $amqp_durable_queues, - kombu_compression => $kombu_compression, - kombu_ssl_ca_certs => $kombu_ssl_ca_certs, - kombu_ssl_certfile => $kombu_ssl_certfile, - kombu_ssl_keyfile => $kombu_ssl_keyfile, - kombu_ssl_version => $kombu_ssl_version, - rabbit_ha_queues => $rabbit_ha_queues, - } - - oslo::messaging::amqp { 'congress_config': - server_request_prefix => $amqp_server_request_prefix, - broadcast_prefix => $amqp_broadcast_prefix, - group_request_prefix => $amqp_group_request_prefix, - container_name => $amqp_container_name, - idle_timeout => $amqp_idle_timeout, - trace => $amqp_trace, - ssl_ca_file => $amqp_ssl_ca_file, - ssl_cert_file => $amqp_ssl_cert_file, - ssl_key_file => $amqp_ssl_key_file, - ssl_key_password => $amqp_ssl_key_password, - allow_insecure_clients => $amqp_allow_insecure_clients, - sasl_mechanisms => $amqp_sasl_mechanisms, - sasl_config_dir => $amqp_sasl_config_dir, - sasl_config_name => $amqp_sasl_config_name, - username => $amqp_username, - password => $amqp_password, - } - - oslo::messaging::default { 'congress_config': - transport_url => $default_transport_url, - rpc_response_timeout => $rpc_response_timeout, - control_exchange => $control_exchange, - } - - oslo::messaging::notifications { 'congress_config': - transport_url => $notification_transport_url, - driver => $notification_driver, - topics => $notification_topics, - } -} diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp deleted file mode 100644 index dd04fa8..0000000 --- a/manifests/keystone/auth.pp +++ /dev/null @@ -1,108 +0,0 @@ -# == Class: congress::keystone::auth -# -# Configures congress user, service and endpoint in Keystone. -# -# === Parameters -# -# [*password*] -# (required) Password for congress user. -# -# [*auth_name*] -# (Optional) Username for congress service. -# Defaults to 'congress'. -# -# [*email*] -# (Optional) Email for congress user. -# Defaults to 'congress@localhost'. -# -# [*tenant*] -# (Optional) Tenant for congress user. -# Defaults to 'services'. -# -# [*configure_endpoint*] -# (Optional) Should congress endpoint be configured? -# Defaults to true -# -# [*configure_user*] -# (Optional) Should the service user be configured? -# Defaults to true -# -# [*configure_user_role*] -# (Optional) Should the admin role be configured for the service user? -# Defaults to true -# -# [*service_type*] -# (Optional) Type of service. -# Defaults to 'policy'. -# -# [*region*] -# (Optional) Region for endpoint. -# Defaults to 'RegionOne'. -# -# [*service_name*] -# (Optional) Name of the service. -# Defaults to the value of 'congress'. -# -# [*service_description*] -# (Optional) Description of the service. -# Default to 'congress policy Service' -# -# [*public_url*] -# (0ptional) The endpoint's public url. -# This url should *not* contain any trailing '/'. -# Defaults to 'http://127.0.0.1:1789' -# -# [*admin_url*] -# (Optional) The endpoint's admin url. -# This url should *not* contain any trailing '/'. -# Defaults to 'http://127.0.0.1:1789' -# -# [*internal_url*] -# (Optional) The endpoint's internal url. -# Defaults to 'http://127.0.0.1:1789' -# -class congress::keystone::auth ( - $password, - $auth_name = 'congress', - $email = 'congress@localhost', - $tenant = 'services', - $configure_endpoint = true, - $configure_user = true, - $configure_user_role = true, - $service_name = 'congress', - $service_description = 'congress Policy Service', - $service_type = 'policy', - $region = 'RegionOne', - $public_url = 'http://127.0.0.1:1789', - $admin_url = 'http://127.0.0.1:1789', - $internal_url = 'http://127.0.0.1:1789', -) { - - include congress::deps - - if $configure_user_role { - Keystone_user_role["${auth_name}@${tenant}"] ~> Anchor['congress::service::end'] - } - - if $configure_endpoint { - Keystone_endpoint["${region}/${service_name}::${service_type}"] ~> Anchor['congress::service::end'] - } - - keystone::resource::service_identity { 'congress': - configure_user => $configure_user, - configure_user_role => $configure_user_role, - configure_endpoint => $configure_endpoint, - service_name => $service_name, - service_type => $service_type, - service_description => $service_description, - region => $region, - auth_name => $auth_name, - password => $password, - email => $email, - tenant => $tenant, - public_url => $public_url, - internal_url => $internal_url, - admin_url => $admin_url, - } - -} diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp deleted file mode 100644 index 9063456..0000000 --- a/manifests/keystone/authtoken.pp +++ /dev/null @@ -1,243 +0,0 @@ -# class: congress::keystone::authtoken -# -# Configure the keystone_authtoken section in the configuration file -# -# === Parameters -# -# [*password*] -# (Required) Password to create for the service user -# -# [*username*] -# (Optional) The name of the service user -# Defaults to 'congress' -# -# [*auth_url*] -# (Optional) The URL to use for authentication. -# Defaults to 'http://localhost:5000'. -# -# [*project_name*] -# (Optional) Service project name -# Defaults to 'services' -# -# [*user_domain_name*] -# (Optional) Name of domain for $username -# Defaults to 'Default' -# -# [*project_domain_name*] -# (Optional) Name of domain for $project_name -# Defaults to 'Default' -# -# [*insecure*] -# (Optional) If true, explicitly allow TLS without checking server cert -# against any certificate authorities. WARNING: not recommended. Use with -# caution. -# Defaults to $::os_service_default -# -# [*auth_section*] -# (Optional) Config Section from which to load plugin specific options -# Defaults to $::os_service_default. -# -# [*auth_type*] -# (Optional) Authentication type to load -# Defaults to 'password' -# -# [*www_authenticate_uri*] -# (Optional) Complete public Identity API endpoint. -# Defaults to 'http://localhost:5000'. -# -# [*auth_version*] -# (Optional) API version of the admin Identity API endpoint. -# Defaults to $::os_service_default. -# -# [*cache*] -# (Optional) Env key for the swift cache. -# Defaults to $::os_service_default. -# -# [*cafile*] -# (Optional) A PEM encoded Certificate Authority to use when verifying HTTPs -# connections. -# Defaults to $::os_service_default. -# -# [*certfile*] -# (Optional) Required if identity server requires client certificate -# Defaults to $::os_service_default. -# -# [*delay_auth_decision*] -# (Optional) Do not handle authorization requests within the middleware, but -# delegate the authorization decision to downstream WSGI components. Boolean -# value -# Defaults to $::os_service_default. -# -# [*enforce_token_bind*] -# (Optional) Used to control the use and type of token binding. Can be set -# to: "disabled" to not check token binding. "permissive" (default) to -# validate binding information if the bind type is of a form known to the -# server and ignore it if not. "strict" like "permissive" but if the bind -# type is unknown the token will be rejected. "required" any form of token -# binding is needed to be allowed. Finally the name of a binding method that -# must be present in tokens. String value. -# Defaults to $::os_service_default. -# -# [*http_connect_timeout*] -# (Optional) Request timeout value for communicating with Identity API -# server. -# Defaults to $::os_service_default. -# -# [*http_request_max_retries*] -# (Optional) How many times are we trying to reconnect when communicating -# with Identity API Server. Integer value -# Defaults to $::os_service_default. -# -# [*include_service_catalog*] -# (Optional) Indicate whether to set the X-Service-Catalog header. If False, -# middleware will not ask for service catalog on token validation and will -# not set the X-Service-Catalog header. Boolean value. -# Defaults to $::os_service_default. -# -# [*keyfile*] -# (Optional) Required if identity server requires client certificate -# Defaults to $::os_service_default. -# -# [*memcache_pool_conn_get_timeout*] -# (Optional) Number of seconds that an operation will wait to get a memcached -# client connection from the pool. Integer value -# Defaults to $::os_service_default. -# -# [*memcache_pool_dead_retry*] -# (Optional) Number of seconds memcached server is considered dead before it -# is tried again. Integer value -# Defaults to $::os_service_default. -# -# [*memcache_pool_maxsize*] -# (Optional) Maximum total number of open connections to every memcached -# server. Integer value -# Defaults to $::os_service_default. -# -# [*memcache_pool_socket_timeout*] -# (Optional) Number of seconds a connection to memcached is held unused in -# the pool before it is closed. Integer value -# Defaults to $::os_service_default. -# -# [*memcache_pool_unused_timeout*] -# (Optional) Number of seconds a connection to memcached is held unused in -# the pool before it is closed. Integer value -# Defaults to $::os_service_default. -# -# [*memcache_secret_key*] -# (Optional, mandatory if memcache_security_strategy is defined) This string -# is used for key derivation. -# Defaults to $::os_service_default. -# -# [*memcache_security_strategy*] -# (Optional) If defined, indicate whether token data should be authenticated -# or authenticated and encrypted. If MAC, token data is authenticated (with -# HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the -# cache. If the value is not one of these options or empty, auth_token will -# raise an exception on initialization. -# Defaults to $::os_service_default. -# -# [*memcache_use_advanced_pool*] -# (Optional) Use the advanced (eventlet safe) memcached client pool. The -# advanced pool will only work under python 2.x Boolean value -# Defaults to $::os_service_default. -# -# [*memcached_servers*] -# (Optional) Optionally specify a list of memcached server(s) to use for -# caching. If left undefined, tokens will instead be cached in-process. -# Defaults to $::os_service_default. -# -# [*manage_memcache_package*] -# (Optional) Whether to install the python-memcache package. -# Defaults to false. -# -# [*region_name*] -# (Optional) The region in which the identity server can be found. -# Defaults to $::os_service_default. -# -# [*token_cache_time*] -# (Optional) In order to prevent excessive effort spent validating tokens, -# the middleware caches previously-seen tokens for a configurable duration -# (in seconds). Set to -1 to disable caching completely. Integer value -# Defaults to $::os_service_default. -# -# [*service_token_roles_required*] -# (optional) backwards compatibility to ensure that the service tokens are -# compared against a list of possible roles for validity -# true/false -# Defaults to $::os_service_default. -# -class congress::keystone::authtoken( - $password, - $username = 'congress', - $auth_url = 'http://localhost:5000', - $project_name = 'services', - $user_domain_name = 'Default', - $project_domain_name = 'Default', - $insecure = $::os_service_default, - $auth_section = $::os_service_default, - $auth_type = 'password', - $www_authenticate_uri = 'http://localhost:5000', - $auth_version = $::os_service_default, - $cache = $::os_service_default, - $cafile = $::os_service_default, - $certfile = $::os_service_default, - $delay_auth_decision = $::os_service_default, - $enforce_token_bind = $::os_service_default, - $http_connect_timeout = $::os_service_default, - $http_request_max_retries = $::os_service_default, - $include_service_catalog = $::os_service_default, - $keyfile = $::os_service_default, - $memcache_pool_conn_get_timeout = $::os_service_default, - $memcache_pool_dead_retry = $::os_service_default, - $memcache_pool_maxsize = $::os_service_default, - $memcache_pool_socket_timeout = $::os_service_default, - $memcache_pool_unused_timeout = $::os_service_default, - $memcache_secret_key = $::os_service_default, - $memcache_security_strategy = $::os_service_default, - $memcache_use_advanced_pool = $::os_service_default, - $memcached_servers = $::os_service_default, - $manage_memcache_package = false, - $region_name = $::os_service_default, - $token_cache_time = $::os_service_default, - $service_token_roles_required = $::os_service_default, -) { - - include congress::deps - - keystone::resource::authtoken { 'congress_config': - username => $username, - password => $password, - project_name => $project_name, - auth_url => $auth_url, - www_authenticate_uri => $www_authenticate_uri, - auth_version => $auth_version, - auth_type => $auth_type, - auth_section => $auth_section, - user_domain_name => $user_domain_name, - project_domain_name => $project_domain_name, - insecure => $insecure, - cache => $cache, - cafile => $cafile, - certfile => $certfile, - delay_auth_decision => $delay_auth_decision, - enforce_token_bind => $enforce_token_bind, - http_connect_timeout => $http_connect_timeout, - http_request_max_retries => $http_request_max_retries, - include_service_catalog => $include_service_catalog, - keyfile => $keyfile, - memcache_pool_conn_get_timeout => $memcache_pool_conn_get_timeout, - memcache_pool_dead_retry => $memcache_pool_dead_retry, - memcache_pool_maxsize => $memcache_pool_maxsize, - memcache_pool_socket_timeout => $memcache_pool_socket_timeout, - memcache_secret_key => $memcache_secret_key, - memcache_security_strategy => $memcache_security_strategy, - memcache_use_advanced_pool => $memcache_use_advanced_pool, - memcache_pool_unused_timeout => $memcache_pool_unused_timeout, - memcached_servers => $memcached_servers, - manage_memcache_package => $manage_memcache_package, - region_name => $region_name, - token_cache_time => $token_cache_time, - service_token_roles_required => $service_token_roles_required, - } -} - diff --git a/manifests/logging.pp b/manifests/logging.pp deleted file mode 100644 index f3f71e2..0000000 --- a/manifests/logging.pp +++ /dev/null @@ -1,149 +0,0 @@ -# Class congress::logging -# -# congress logging configuration -# -# == parameters -# -# [*debug*] -# (Optional) Should the daemons log debug messages -# Defaults to $::os_service_default -# -# [*use_syslog*] -# (Optional) Use syslog for logging. -# Defaults to $::os_service_default -# -# [*use_json*] -# (Optional) Use json for logging. -# Defaults to $::os_service_default -# -# [*use_journal*] -# (Optional) Use journal for logging. -# Defaults to $::os_service_default -# -# [*use_stderr*] -# (Optional) Use stderr for logging -# Defaults to $::os_service_default -# -# [*syslog_log_facility*] -# (Optional) Syslog facility to receive log lines. -# Defaults to $::os_service_default -# -# [*log_dir*] -# (Optional) Directory where logs should be stored. -# If set to $::os_service_default, it will not log to any directory. -# Defaults to '/var/log/congress'. -# -# [*log_file*] -# (Optional) File where logs should be stored. -# Defaults to '/var/log/congress/congress.log' -# -# [*logging_context_format_string*] -# (Optional) Format string to use for log messages with context. -# Defaults to $::os_service_default -# Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\ -# [%(request_id)s %(user_identity)s] %(instance)s%(message)s' -# -# [*logging_default_format_string*] -# (Optional) Format string to use for log messages without context. -# Defaults to $::os_service_default -# Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\ -# [-] %(instance)s%(message)s' -# -# [*logging_debug_format_suffix*] -# (Optional) Formatted data to append to log format when level is DEBUG. -# Defaults to $::os_service_default -# Example: '%(funcName)s %(pathname)s:%(lineno)d' -# -# [*logging_exception_prefix*] -# (Optional) Prefix each line of exception output with this format. -# Defaults to $::os_service_default -# Example: '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s' -# -# [*log_config_append*] -# (Optional) The name of an additional logging configuration file. -# Defaults to $::os_service_default -# See https://docs.python.org/2/howto/logging.html -# -# [*default_log_levels*] -# (0ptional) Hash of logger (keys) and level (values) pairs. -# Defaults to $::os_service_default -# Example: -# { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', -# 'sqlalchemy' => 'WARN', 'suds' => 'INFO', -# 'oslo.messaging' => 'INFO', 'iso8601' => 'WARN', -# 'requests.packages.urllib3.connectionpool' => 'WARN', -# 'urllib3.connectionpool' => 'WARN', -# 'websocket' => 'WARN', 'congressmiddleware' => 'WARN', -# 'routes.middleware' => 'WARN', stevedore => 'WARN' } -# -# [*publish_errors*] -# (Optional) Publish error events (boolean value). -# Defaults to $::os_service_default -# -# [*fatal_deprecations*] -# (Optional) Make deprecations fatal (boolean value) -# Defaults to $::os_service_default -# -# [*instance_format*] -# (Optional) If an instance is passed with the log message, format it -# like this (string value). -# Defaults to undef. -# Example: '[instance: %(uuid)s] ' -# -# [*instance_uuid_format*] -# (Optional) If an instance UUID is passed with the log message, format -# it like this (string value). -# Defaults to $::os_service_default -# Example: instance_uuid_format='[instance: %(uuid)s] ' -# -# [*log_date_format*] -# (Optional) Format string for %%(asctime)s in log records. -# Defaults to $::os_service_default -# Example: 'Y-%m-%d %H:%M:%S' -# -class congress::logging( - $use_syslog = $::os_service_default, - $use_json = $::os_service_default, - $use_journal = $::os_service_default, - $use_stderr = $::os_service_default, - $syslog_log_facility = $::os_service_default, - $log_dir = '/var/log/congress', - $log_file = '/var/log/congress/congress.log', - $debug = $::os_service_default, - $logging_context_format_string = $::os_service_default, - $logging_default_format_string = $::os_service_default, - $logging_debug_format_suffix = $::os_service_default, - $logging_exception_prefix = $::os_service_default, - $log_config_append = $::os_service_default, - $default_log_levels = $::os_service_default, - $publish_errors = $::os_service_default, - $fatal_deprecations = $::os_service_default, - $instance_format = $::os_service_default, - $instance_uuid_format = $::os_service_default, - $log_date_format = $::os_service_default, -) { - - include congress::deps - - oslo::log { 'congress_config': - use_stderr => $use_stderr, - use_syslog => $use_syslog, - use_json => $use_json, - use_journal => $use_journal, - log_dir => $log_dir, - log_file => $log_file, - debug => $debug, - logging_context_format_string => $logging_context_format_string, - logging_default_format_string => $logging_default_format_string, - logging_debug_format_suffix => $logging_debug_format_suffix, - logging_exception_prefix => $logging_exception_prefix, - log_config_append => $log_config_append, - default_log_levels => $default_log_levels, - publish_errors => $publish_errors, - fatal_deprecations => $fatal_deprecations, - instance_format => $instance_format, - instance_uuid_format => $instance_uuid_format, - log_date_format => $log_date_format, - syslog_log_facility => $syslog_log_facility, - } -} diff --git a/manifests/params.pp b/manifests/params.pp deleted file mode 100644 index 3fda834..0000000 --- a/manifests/params.pp +++ /dev/null @@ -1,25 +0,0 @@ -# == Class: congress::params -# -# Parameters for puppet-congress -# -class congress::params { - include openstacklib::defaults - $pyvers = $::openstacklib::defaults::pyvers - - $client_package_name = "python${pyvers}-congressclient" - $group = 'congress' - - case $::osfamily { - 'RedHat': { - $package_name = 'openstack-congress' - $service_name = 'openstack-congress-server' - } - 'Debian': { - $package_name = 'congress-server' - $service_name = 'congress-server' - } - default: { - fail("Unsupported osfamily: ${::osfamily} operatingsystem") - } - } -} diff --git a/manifests/policy.pp b/manifests/policy.pp deleted file mode 100644 index d5b6e5a..0000000 --- a/manifests/policy.pp +++ /dev/null @@ -1,46 +0,0 @@ -# == Class: congress::policy -# -# Configure the congress policies -# -# === Parameters -# -# [*policies*] -# (Optional) Set of policies to configure for congress -# Example : -# { -# 'congress-context_is_admin' => { -# 'key' => 'context_is_admin', -# 'value' => 'true' -# }, -# 'congress-default' => { -# 'key' => 'default', -# 'value' => 'rule:admin_or_owner' -# } -# } -# Defaults to empty hash. -# -# [*policy_path*] -# (Optional) Path to the nova policy.json file -# Defaults to /etc/congress/policy.json -# -class congress::policy ( - $policies = {}, - $policy_path = '/etc/congress/policy.json', -) { - - include congress::deps - include congress::params - - validate_legacy(Hash, 'validate_hash', $policies) - - Openstacklib::Policy::Base { - file_path => $policy_path, - file_user => 'root', - file_group => $::congress::params::group, - } - - create_resources('openstacklib::policy::base', $policies) - - oslo::policy { 'congress_config': policy_file => $policy_path } - -} diff --git a/manifests/server.pp b/manifests/server.pp deleted file mode 100644 index bcdfe76..0000000 --- a/manifests/server.pp +++ /dev/null @@ -1,63 +0,0 @@ -# = Class: congress::server -# -# This class manages the Congress server. -# -# [*enabled*] -# (Optional) Service enable state for congress-server. -# Defaults to true. -# -# [*manage_service*] -# (Optional) Whether the service is managed by this puppet class. -# Defaults to true. -# -# [*auth_strategy*] -# (optional) Type of authentication to be used. -# Defaults to 'keystone' -# -# [*bind_host*] -# (optional) The host IP to bind to. -# Defaults to $::os_service_default -# -# [*bind_port*] -# (optional) The port to bind to. -# Defaults to $::os_service_default -# -class congress::server( - $manage_service = true, - $enabled = true, - $auth_strategy = 'keystone', - $bind_host = $::os_service_default, - $bind_port = $::os_service_default, -) { - - include congress::deps - include congress::params - include congress::policy - - if $auth_strategy == 'keystone' { - include congress::keystone::authtoken - } - - congress_config { - 'DEFAULT/bind_host' : value => $bind_host; - 'DEFAULT/bind_port' : value => $bind_port; - } - - if $manage_service { - if $enabled { - $service_ensure = 'running' - } else { - $service_ensure = 'stopped' - } - } - - if $manage_service { - service { 'congress-server': - ensure => $service_ensure, - name => $::congress::params::service_name, - enable => $enabled, - tag => 'congress-service' - } - } - -} diff --git a/metadata.json b/metadata.json deleted file mode 100644 index 457ad52..0000000 --- a/metadata.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "author": "OpenStack Contributors", - "dependencies": [ - { - "name": "puppetlabs/inifile", - "version_requirement": ">=2.0.0 <3.0.0" - }, - { - "name": "puppetlabs/stdlib", - "version_requirement": ">=5.0.0 <7.0.0" - }, - { - "name": "openstack/openstacklib", - "version_requirement": ">=17.0.0 <18.0.0" - }, - { - "name": "openstack/oslo", - "version_requirement": ">=17.0.0 <18.0.0" - }, - { - "name": "openstack/keystone", - "version_requirement": ">=17.0.0 <18.0.0" - } - ], - "description": "Installs and configures OpenStack Congress.", - "issues_url": "https://bugs.launchpad.net/puppet-congress", - "license": "Apache-2.0", - "name": "openstack-congress", - "operatingsystem_support": [ - { - "operatingsystem": "Debian", - "operatingsystemrelease": [ - "10" - ] - }, - { - "operatingsystem": "Fedora", - "operatingsystemrelease": [ - "24" - ] - }, - { - "operatingsystem": "RedHat", - "operatingsystemrelease": [ - "8" - ] - }, - { - "operatingsystem": "CentOS", - "operatingsystemrelease": [ - "8" - ] - }, - { - "operatingsystem": "Ubuntu", - "operatingsystemrelease": [ - "18.04" - ] - } - ], - "project_page": "https://launchpad.net/puppet-congress", - "requirements": [ - { - "name": "puppet", - "version_requirement": ">= 5.0.0 < 7.0.0" - } - ], - "source": "git://github.com/openstack/puppet-congress.git", - "summary": "Puppet module for OpenStack Congress", - "version": "17.0.0" -} diff --git a/releasenotes/notes/add-openstackclient-client-9e49434320313093.yaml b/releasenotes/notes/add-openstackclient-client-9e49434320313093.yaml deleted file mode 100644 index 7fe5782..0000000 --- a/releasenotes/notes/add-openstackclient-client-9e49434320313093.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -features: - - Add openstackclient installation to the client class. diff --git a/releasenotes/notes/add-pool_timeout-option-for-db-b4cac6e4f26fcf7d.yaml b/releasenotes/notes/add-pool_timeout-option-for-db-b4cac6e4f26fcf7d.yaml deleted file mode 100644 index be30389..0000000 --- a/releasenotes/notes/add-pool_timeout-option-for-db-b4cac6e4f26fcf7d.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -features: - - | - Adds the pool_timeout option for configuring oslo.db. This will - configure this value for pool_timeout with SQLAlchemy. diff --git a/releasenotes/notes/add-use_journal-option-for-logging-8d3f1dcc7aa1da03.yaml b/releasenotes/notes/add-use_journal-option-for-logging-8d3f1dcc7aa1da03.yaml deleted file mode 100644 index 12b190e..0000000 --- a/releasenotes/notes/add-use_journal-option-for-logging-8d3f1dcc7aa1da03.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -features: - - | - Adds the use_journal option for configuring oslo.log. This will enable - passing the logs to journald. diff --git a/releasenotes/notes/add_messaging_notification_parameters-71a194ef982371d6.yaml b/releasenotes/notes/add_messaging_notification_parameters-71a194ef982371d6.yaml deleted file mode 100644 index e14a397..0000000 --- a/releasenotes/notes/add_messaging_notification_parameters-71a194ef982371d6.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -features: - - Add new parameter "notification_topics", AMQP topic used - for OpenStack notifications. - - Add new parameter "notification_driver", driver or drivers to - handle sending notifications. Value can be a string or a list. diff --git a/releasenotes/notes/add_rabbit_kombu_options-93fa34586e34eb65.yaml b/releasenotes/notes/add_rabbit_kombu_options-93fa34586e34eb65.yaml deleted file mode 100644 index 8ade115..0000000 --- a/releasenotes/notes/add_rabbit_kombu_options-93fa34586e34eb65.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -features: - - | - Adds the kombu_failover_strategy option for configuring oslo.messaging.rabbit. - This will determines how the next RabbitMQ node is chosen in case the one we - are currently connected to becomes unavailable. diff --git a/releasenotes/notes/default_domain-a873f234d8791ed7.yaml b/releasenotes/notes/default_domain-a873f234d8791ed7.yaml deleted file mode 100644 index 7394505..0000000 --- a/releasenotes/notes/default_domain-a873f234d8791ed7.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -issues: - - | - Keystone v2.0 API was removed so we need to set a default value - for user_domain_name and project_domain name, which will be - Default as it is already in some other classes in modules. diff --git a/releasenotes/notes/deprecate_auth_uri_parameter-ae55aa799c7bf6f5.yaml b/releasenotes/notes/deprecate_auth_uri_parameter-ae55aa799c7bf6f5.yaml deleted file mode 100644 index 86d56c0..0000000 --- a/releasenotes/notes/deprecate_auth_uri_parameter-ae55aa799c7bf6f5.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -deprecations: - - auth_uri is deprecated and will be removed in a future release. - Please use www_authenticate_uri instead. diff --git a/releasenotes/notes/deprecate_database_min_pool_size-option-88a1253ea6f646ce.yaml b/releasenotes/notes/deprecate_database_min_pool_size-option-88a1253ea6f646ce.yaml deleted file mode 100644 index 03e58c2..0000000 --- a/releasenotes/notes/deprecate_database_min_pool_size-option-88a1253ea6f646ce.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -deprecations: - - database_min_pool_size option is now deprecated for removal, the - parameter has no effect. diff --git a/releasenotes/notes/deprecate_idle_timeout_parameter-af6d704f1e7126ba.yaml b/releasenotes/notes/deprecate_idle_timeout_parameter-af6d704f1e7126ba.yaml deleted file mode 100644 index 09e76c4..0000000 --- a/releasenotes/notes/deprecate_idle_timeout_parameter-af6d704f1e7126ba.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -deprecations: - - database_idle_timeout is deprecated and will be removed in a future - release. Please use database_connection_recycle_time instead. diff --git a/releasenotes/notes/deprecate_pki_related_parameters-b62daba9b6af38cb.yaml b/releasenotes/notes/deprecate_pki_related_parameters-b62daba9b6af38cb.yaml deleted file mode 100644 index 7aa4e60..0000000 --- a/releasenotes/notes/deprecate_pki_related_parameters-b62daba9b6af38cb.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -deprecations: - - check_revocations_for_cached option is now deprecated for removal, the - parameter has no effect. - - hash_algorithms option is now deprecated for removal, the parameter - has no effect. diff --git a/releasenotes/notes/deprecate_revocation_cache_time_parameter-6eafa1067032f8be.yaml b/releasenotes/notes/deprecate_revocation_cache_time_parameter-6eafa1067032f8be.yaml deleted file mode 100644 index 438a913..0000000 --- a/releasenotes/notes/deprecate_revocation_cache_time_parameter-6eafa1067032f8be.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -deprecations: - - revocation_cache_time option is now deprecated for removal, the - parameter has no effect. diff --git a/releasenotes/notes/deprecate_rpc_backend_parameter-a671397f2235d98e.yaml b/releasenotes/notes/deprecate_rpc_backend_parameter-a671397f2235d98e.yaml deleted file mode 100644 index 000db4f..0000000 --- a/releasenotes/notes/deprecate_rpc_backend_parameter-a671397f2235d98e.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -deprecations: - - congress::rpc_backend is deprecated and will be removed in a future - release. Please use congress::default_transport_url instead. diff --git a/releasenotes/notes/disabled_drivers-c15358e53443e819.yaml b/releasenotes/notes/disabled_drivers-c15358e53443e819.yaml deleted file mode 100644 index 6fa5c3a..0000000 --- a/releasenotes/notes/disabled_drivers-c15358e53443e819.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -features: - - | - The ``congress::disabled_drivers`` parameter is added to configure a list - of disabled drivers. -deprecations: - - | - The ``congress::drivers`` parameter has been deprecated and will be removed - in a future release. Use ``congress::disabled_drivers`` instead. diff --git a/releasenotes/notes/dont-include-logging-init-a2ebac9e1ad21682.yaml b/releasenotes/notes/dont-include-logging-init-a2ebac9e1ad21682.yaml deleted file mode 100644 index 18006e3..0000000 --- a/releasenotes/notes/dont-include-logging-init-a2ebac9e1ad21682.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -upgrade: - - | - congress::logging is now not included in init class by default. diff --git a/releasenotes/notes/log-json-87135a773f9813d6.yaml b/releasenotes/notes/log-json-87135a773f9813d6.yaml deleted file mode 100644 index 41c0413..0000000 --- a/releasenotes/notes/log-json-87135a773f9813d6.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -features: - - | - Expose use_json logging parameter, which enables JSON formatted logging. diff --git a/releasenotes/notes/openstack_db_tag-88dbf004beb21248.yaml b/releasenotes/notes/openstack_db_tag-88dbf004beb21248.yaml deleted file mode 100644 index 4872e11..0000000 --- a/releasenotes/notes/openstack_db_tag-88dbf004beb21248.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -features: - - Add openstack-db tag to Exec that run db-sync. diff --git a/releasenotes/notes/puppet4-mysql-func-7659cf892ef01823.yaml b/releasenotes/notes/puppet4-mysql-func-7659cf892ef01823.yaml deleted file mode 100644 index 9db533e..0000000 --- a/releasenotes/notes/puppet4-mysql-func-7659cf892ef01823.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -upgrade: - - | - This module now requires a puppetlabs-mysql version >= 6.0.0 diff --git a/releasenotes/notes/rabbitmq-heartbeat-over-pthread-a0355cfcb8ff0dfe.yaml b/releasenotes/notes/rabbitmq-heartbeat-over-pthread-a0355cfcb8ff0dfe.yaml deleted file mode 100644 index 496d227..0000000 --- a/releasenotes/notes/rabbitmq-heartbeat-over-pthread-a0355cfcb8ff0dfe.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -features: - - | - Allow users to run the RabbitMQ heartbeat over a native python thread in the - oslo.messaging RabbitMQ driver, by using the `rabbit_heartbeat_in_pthread` - option in configuration. diff --git a/releasenotes/notes/release-note-ubuntu-py3-89287b4ad32a0739.yaml b/releasenotes/notes/release-note-ubuntu-py3-89287b4ad32a0739.yaml deleted file mode 100644 index 8ec2452..0000000 --- a/releasenotes/notes/release-note-ubuntu-py3-89287b4ad32a0739.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -prelude: > - In this release Ubuntu has moved all projects that supported it to python3 - which means that there will be a lot of changes. The Puppet OpenStack project - does not test the upgrade path from python2 to python3 packages so there might - be manual steps required when moving to the python3 packages. -upgrade: - - | - Ubuntu packages are now using python3, the upgrade path is not tested by - Puppet OpenStack. Manual steps may be required when upgrading. diff --git a/releasenotes/notes/remove-auth-uri-d2236454394e0db8.yaml b/releasenotes/notes/remove-auth-uri-d2236454394e0db8.yaml deleted file mode 100644 index b3e3719..0000000 --- a/releasenotes/notes/remove-auth-uri-d2236454394e0db8.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -upgrade: - - | - The deprecated parameter auth_uri is now removed, please use www_authenticate_uri. diff --git a/releasenotes/notes/remove-ceilometer-driver-c68eee76e6814632.yaml b/releasenotes/notes/remove-ceilometer-driver-c68eee76e6814632.yaml deleted file mode 100644 index 4bb1172..0000000 --- a/releasenotes/notes/remove-ceilometer-driver-c68eee76e6814632.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -upgrade: - - | - Removes the ceilometer_driver from the datasources as it was removed by - congress during the Queens cycle and causes service failures if referenced. diff --git a/releasenotes/notes/remove-deprecated-params-bf2f9e3894c14d76.yaml b/releasenotes/notes/remove-deprecated-params-bf2f9e3894c14d76.yaml deleted file mode 100644 index a859583..0000000 --- a/releasenotes/notes/remove-deprecated-params-bf2f9e3894c14d76.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -upgrade: - - | - The deprecated parameters congress::rabbit_host, congress::rabbit_hosts, congress::rabbit_password, - congress::rabbit_port, congress::rabbit_userid, congress::rabbit_virtual_host and congress::rpc_backend - is removed. Please use congress::default_transport_url instead. diff --git a/releasenotes/notes/remove_deprecated_keystone_revocation_cache_time_option-ab97e2d4917acf5b.yaml b/releasenotes/notes/remove_deprecated_keystone_revocation_cache_time_option-ab97e2d4917acf5b.yaml deleted file mode 100644 index e7fe971..0000000 --- a/releasenotes/notes/remove_deprecated_keystone_revocation_cache_time_option-ab97e2d4917acf5b.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -upgrade: - - Deprecated keystone::authtoken::revocation_cache_time option has been removed. diff --git a/releasenotes/notes/remove_deprecated_pki_related_options-8b0e7e3b16312266.yaml b/releasenotes/notes/remove_deprecated_pki_related_options-8b0e7e3b16312266.yaml deleted file mode 100644 index 62af34f..0000000 --- a/releasenotes/notes/remove_deprecated_pki_related_options-8b0e7e3b16312266.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -upgrade: - - | - The deprecated pki related options check_revocations_for_cached and - hash_algorithms option has been removed. diff --git a/releasenotes/notes/remove_idle_timeout_option-bfe9ff15fb76b192.yaml b/releasenotes/notes/remove_idle_timeout_option-bfe9ff15fb76b192.yaml deleted file mode 100644 index 6ba54d4..0000000 --- a/releasenotes/notes/remove_idle_timeout_option-bfe9ff15fb76b192.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -upgrade: - - Deprecated idle_timeout option has been removed. diff --git a/releasenotes/notes/service_token_roles_required-a13f8e9107379f7e.yaml b/releasenotes/notes/service_token_roles_required-a13f8e9107379f7e.yaml deleted file mode 100644 index 60a4521..0000000 --- a/releasenotes/notes/service_token_roles_required-a13f8e9107379f7e.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -features: - - Service_token_roles_required missing in the server config file which - allows backwards compatibility to ensure that the service tokens are - compared against a list of possible roles for validity. diff --git a/releasenotes/source/_static/.placeholder b/releasenotes/source/_static/.placeholder deleted file mode 100644 index e69de29..0000000 diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py deleted file mode 100644 index c79758d..0000000 --- a/releasenotes/source/conf.py +++ /dev/null @@ -1,255 +0,0 @@ -# -*- coding: utf-8 -*- -# 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. -# - -# If extensions (or modules to document with autodoc) are in another directory, -# add these directories to sys.path here. If the directory is relative to the -# documentation root, use os.path.abspath to make it absolute, like shown here. -#sys.path.insert(0, os.path.abspath('.')) - -# -- General configuration ------------------------------------------------ - - -# If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' - -# Add any Sphinx extension module names here, as strings. They can be -# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom -# ones. -extensions = [ - 'openstackdocstheme', - 'reno.sphinxext', -] - -# Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] - -# The suffix of source filenames. -source_suffix = '.rst' - -# The encoding of source files. -#source_encoding = 'utf-8-sig' - -# The master toctree document. -master_doc = 'index' - -# General information about the project. -copyright = u'2016, Puppet OpenStack Developers' - -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The short X.Y version. -version = '' -# The full version, including alpha/beta/rc tags. -release = '' - -# The language for content autogenerated by Sphinx. Refer to documentation -# for a list of supported languages. -#language = None - -# There are two options for replacing |today|: either, you set today to some -# non-false value, then it is used: -#today = '' -# Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' - -# List of patterns, relative to source directory, that match files and -# directories to ignore when looking for source files. -exclude_patterns = [] - -# The reST default role (used for this markup: `text`) to use for all -# documents. -#default_role = None - -# If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True - -# If true, the current module name will be prepended to all description -# unit titles (such as .. function::). -#add_module_names = True - -# If true, sectionauthor and moduleauthor directives will be shown in the -# output. They are ignored by default. -#show_authors = False - -# The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'native' - -# A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] - -# If true, keep warnings as "system message" paragraphs in the built documents. -#keep_warnings = False - - -# -- Options for HTML output ---------------------------------------------- - -# The theme to use for HTML and HTML Help pages. See the documentation for -# a list of builtin themes. -html_theme = 'openstackdocs' - -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -#html_theme_options = {} - -# Add any paths that contain custom themes here, relative to this directory. -# html_theme_path = [] - -# The name for this set of Sphinx documents. If None, it defaults to -# " v documentation". -#html_title = None - -# A shorter title for the navigation bar. Default is the same as html_title. -#html_short_title = None - -# The name of an image file (relative to this directory) to place at the top -# of the sidebar. -#html_logo = None - -# The name of an image file (within the static path) to use as favicon of the -# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 -# pixels large. -#html_favicon = None - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] - -# Add any extra paths that contain custom files (such as robots.txt or -# .htaccess) here, relative to this directory. These files are copied -# directly to the root of the documentation. -#html_extra_path = [] - -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. - -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -#html_use_smartypants = True - -# Custom sidebar templates, maps document names to template names. -#html_sidebars = {} - -# Additional templates that should be rendered to pages, maps page names to -# template names. -#html_additional_pages = {} - -# If false, no module index is generated. -#html_domain_indices = True - -# If false, no index is generated. -#html_use_index = True - -# If true, the index is split into individual pages for each letter. -#html_split_index = False - -# If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True - -# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -#html_show_sphinx = True - -# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -#html_show_copyright = True - -# If true, an OpenSearch description file will be output, and all pages will -# contain a tag referring to it. The value of this option must be the -# base URL from which the finished HTML is served. -#html_use_opensearch = '' - -# This is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = None - -# Output file base name for HTML help builder. -htmlhelp_basename = 'puppet-congressReleaseNotesdoc' - - -# -- Options for LaTeX output --------------------------------------------- - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, -# author, documentclass [howto, manual, or own class]). -latex_documents = [ - ('index', 'puppet-congressReleaseNotes.tex', u'puppet-congress Release Notes Documentation', - u'2016, Puppet OpenStack Developers', 'manual'), -] - -# The name of an image file (relative to this directory) to place at the top of -# the title page. -#latex_logo = None - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -#latex_use_parts = False - -# If true, show page references after internal links. -#latex_show_pagerefs = False - -# If true, show URL addresses after external links. -#latex_show_urls = False - -# Documents to append as an appendix to all manuals. -#latex_appendices = [] - -# If false, no module index is generated. -#latex_domain_indices = True - - -# -- Options for manual page output --------------------------------------- - -# One entry per manual page. List of tuples -# (source start file, name, description, authors, manual section). -man_pages = [ - ('index', 'puppet-congressreleasenotes', u'puppet-congress Release Notes Documentation', - [u'2016, Puppet OpenStack Developers'], 1) -] - -# If true, show URL addresses after external links. -#man_show_urls = False - - -# -- Options for Texinfo output ------------------------------------------- - -# Grouping the document tree into Texinfo files. List of tuples -# (source start file, target name, title, author, -# dir menu entry, description, category) -texinfo_documents = [ - ('index', 'puppet-congressReleaseNotes', u'puppet-congress Release Notes Documentation', - u'2016, Puppet OpenStack Developers', 'puppet-congressReleaseNotes', 'One line description of project.', - 'Miscellaneous'), -] - -# Documents to append as an appendix to all manuals. -#texinfo_appendices = [] - -# If false, no module index is generated. -#texinfo_domain_indices = True - -# How to display URL addresses: 'footnote', 'no', or 'inline'. -#texinfo_show_urls = 'footnote' - -# If true, do not generate a @detailmenu in the "Top" node's menu. -#texinfo_no_detailmenu = False - -# -- Options for Internationalization output ------------------------------ -locale_dirs = ['locale/'] - -# openstackdocstheme options -openstackdocs_repo_name = 'openstack/puppet-congress' -openstackdocs_bug_project = 'puppet-congress' -openstackdocs_bug_tag = '' diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst deleted file mode 100644 index 5bed4cf..0000000 --- a/releasenotes/source/index.rst +++ /dev/null @@ -1,25 +0,0 @@ -======================================== -Welcome to puppet-congressRelease Notes! -======================================== - -Contents -======== - -.. toctree:: - :maxdepth: 2 - - unreleased - ussuri - train - stein - rocky - queens - pike - ocata - - -Indices and tables -================== - -* :ref:`genindex` -* :ref:`search` diff --git a/releasenotes/source/ocata.rst b/releasenotes/source/ocata.rst deleted file mode 100644 index ebe62f4..0000000 --- a/releasenotes/source/ocata.rst +++ /dev/null @@ -1,6 +0,0 @@ -=================================== - Ocata Series Release Notes -=================================== - -.. release-notes:: - :branch: origin/stable/ocata diff --git a/releasenotes/source/pike.rst b/releasenotes/source/pike.rst deleted file mode 100644 index e43bfc0..0000000 --- a/releasenotes/source/pike.rst +++ /dev/null @@ -1,6 +0,0 @@ -=================================== - Pike Series Release Notes -=================================== - -.. release-notes:: - :branch: stable/pike diff --git a/releasenotes/source/queens.rst b/releasenotes/source/queens.rst deleted file mode 100644 index 36ac616..0000000 --- a/releasenotes/source/queens.rst +++ /dev/null @@ -1,6 +0,0 @@ -=================================== - Queens Series Release Notes -=================================== - -.. release-notes:: - :branch: stable/queens diff --git a/releasenotes/source/rocky.rst b/releasenotes/source/rocky.rst deleted file mode 100644 index 40dd517..0000000 --- a/releasenotes/source/rocky.rst +++ /dev/null @@ -1,6 +0,0 @@ -=================================== - Rocky Series Release Notes -=================================== - -.. release-notes:: - :branch: stable/rocky diff --git a/releasenotes/source/stein.rst b/releasenotes/source/stein.rst deleted file mode 100644 index efaceb6..0000000 --- a/releasenotes/source/stein.rst +++ /dev/null @@ -1,6 +0,0 @@ -=================================== - Stein Series Release Notes -=================================== - -.. release-notes:: - :branch: stable/stein diff --git a/releasenotes/source/train.rst b/releasenotes/source/train.rst deleted file mode 100644 index 5839003..0000000 --- a/releasenotes/source/train.rst +++ /dev/null @@ -1,6 +0,0 @@ -========================== -Train Series Release Notes -========================== - -.. release-notes:: - :branch: stable/train diff --git a/releasenotes/source/unreleased.rst b/releasenotes/source/unreleased.rst deleted file mode 100644 index 2334dd5..0000000 --- a/releasenotes/source/unreleased.rst +++ /dev/null @@ -1,5 +0,0 @@ -============================== - Current Series Release Notes -============================== - - .. release-notes:: diff --git a/releasenotes/source/ussuri.rst b/releasenotes/source/ussuri.rst deleted file mode 100644 index e21e50e..0000000 --- a/releasenotes/source/ussuri.rst +++ /dev/null @@ -1,6 +0,0 @@ -=========================== -Ussuri Series Release Notes -=========================== - -.. release-notes:: - :branch: stable/ussuri diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 6f67c8a..0000000 --- a/setup.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[metadata] -name = puppet-congress -summary = Puppet module for OpenStack Congress -description-file = - README.md -author = OpenStack -author-email = openstack-discuss@lists.openstack.org -home-page = https://docs.openstack.org/puppet-openstack-guide/latest -classifier = - Intended Audience :: Developers - Intended Audience :: System Administrators - License :: OSI Approved :: Apache Software License - Operating System :: POSIX :: Linux diff --git a/setup.py b/setup.py deleted file mode 100644 index 70c2b3f..0000000 --- a/setup.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2013 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. - -# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT -import setuptools - -setuptools.setup( - setup_requires=['pbr'], - pbr=True) diff --git a/spec/acceptance/basic_congress_spec.rb b/spec/acceptance/basic_congress_spec.rb deleted file mode 100644 index fa77540..0000000 --- a/spec/acceptance/basic_congress_spec.rb +++ /dev/null @@ -1,61 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'basic congress' do - - context 'default parameters' do - - it 'should work with no errors' do - pp= <<-EOS - include openstack_integration - include openstack_integration::repos - include openstack_integration::rabbitmq - include openstack_integration::mysql - include openstack_integration::keystone - - rabbitmq_user { 'congress': - admin => true, - password => 'an_even_bigger_secret', - provider => 'rabbitmqctl', - require => Class['rabbitmq'], - } - rabbitmq_user_permissions { 'congress@/': - configure_permission => '.*', - write_permission => '.*', - read_permission => '.*', - provider => 'rabbitmqctl', - require => Class['rabbitmq'], - } - # Congress resources - class { 'congress::logging': - debug => true, - } - class { 'congress': - default_transport_url => 'rabbit://congress:an_even_bigger_secret@127.0.0.1/', - } - class { 'congress::keystone::auth': - password => 'a_big_secret', - } - class { 'congress::db::mysql': - password => 'a_big_secret', - } - class { 'congress::db': - database_connection => 'mysql+pymysql://congress:a_big_secret@127.0.0.1/congress?charset=utf8', - } - class { 'congress::keystone::authtoken': - password => 'a_big_secret', - } - class { 'congress::server': } - class { 'congress::client': } - EOS - - - # Run it twice to test for idempotency - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - end - - describe port(1789) do - it { is_expected.to be_listening.with('tcp') } - end - end -end diff --git a/spec/acceptance/nodesets/centos-70-x64.yml b/spec/acceptance/nodesets/centos-70-x64.yml deleted file mode 100644 index 5f097e9..0000000 --- a/spec/acceptance/nodesets/centos-70-x64.yml +++ /dev/null @@ -1,11 +0,0 @@ -HOSTS: - centos-server-70-x64: - roles: - - master - platform: el-7-x86_64 - box: puppetlabs/centos-7.0-64-nocm - box_url: https://vagrantcloud.com/puppetlabs/centos-7.0-64-nocm - hypervisor: vagrant -CONFIG: - log_level: debug - type: foss diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml deleted file mode 100644 index 486b6a3..0000000 --- a/spec/acceptance/nodesets/default.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-server-14.04-amd64: - 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: - type: foss diff --git a/spec/acceptance/nodesets/nodepool-bionic.yml b/spec/acceptance/nodesets/nodepool-bionic.yml deleted file mode 100644 index ad73cc5..0000000 --- a/spec/acceptance/nodesets/nodepool-bionic.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-18.04-amd64: - roles: - - master - platform: ubuntu-18.04-amd64 - hypervisor: none - ip: 127.0.0.1 -CONFIG: - type: foss - set_env: false 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-centos8.yml b/spec/acceptance/nodesets/nodepool-centos8.yml deleted file mode 100644 index 4111da1..0000000 --- a/spec/acceptance/nodesets/nodepool-centos8.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-80-x64: - roles: - - master - platform: el-8-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/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml deleted file mode 100644 index 8001929..0000000 --- a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml +++ /dev/null @@ -1,11 +0,0 @@ -HOSTS: - ubuntu-server-14.04-amd64: - 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: foss diff --git a/spec/classes/congress_client_spec.rb b/spec/classes/congress_client_spec.rb deleted file mode 100644 index 798d498..0000000 --- a/spec/classes/congress_client_spec.rb +++ /dev/null @@ -1,54 +0,0 @@ -require 'spec_helper' - -describe 'congress::client' do - - shared_examples 'congress::client' do - - context 'with default parameters' do - it 'contains congress::params' do - is_expected.to contain_class('congress::deps') - is_expected.to contain_class('congress::params') - end - it 'contains congressclient' do - is_expected.to contain_package('python-congressclient').with( - :ensure => 'present', - :name => platform_params[:client_package_name], - :tag => 'openstack', - ) - end - it { is_expected.to contain_class('openstacklib::openstackclient') } - end - - end - - on_supported_os({ - :supported_os => OSDefaults.get_supported_os - }).each do |os,facts| - context "on #{os}" do - let (:facts) do - facts.merge!(OSDefaults.get_facts()) - end - - let(:platform_params) do - case facts[:osfamily] - when 'Debian' - { :client_package_name => 'python3-congressclient' } - when 'RedHat' - if facts[:operatingsystem] == 'Fedora' - { :client_package_name => 'python3-congressclient' } - else - if facts[:operatingsystemmajrelease] > '7' - { :client_package_name => 'python3-congressclient' } - else - { :client_package_name => 'python-congressclient' } - end - end - end - end - - it_behaves_like 'congress::client' - end - end - - -end diff --git a/spec/classes/congress_config_spec.rb b/spec/classes/congress_config_spec.rb deleted file mode 100644 index 0433d0b..0000000 --- a/spec/classes/congress_config_spec.rb +++ /dev/null @@ -1,50 +0,0 @@ -require 'spec_helper' - -describe 'congress::config' do - - let(:config_hash) do { - 'DEFAULT/foo' => { 'value' => 'fooValue' }, - 'DEFAULT/bar' => { 'value' => 'barValue' }, - 'DEFAULT/baz' => { 'ensure' => 'absent' } - } - end - - shared_examples_for 'congress_config' do - let :params do - { :congress_config => config_hash } - end - - it { is_expected.to contain_class('congress::deps') } - - it 'configures arbitrary congress-config configurations' do - is_expected.to contain_congress_config('DEFAULT/foo').with_value('fooValue') - is_expected.to contain_congress_config('DEFAULT/bar').with_value('barValue') - is_expected.to contain_congress_config('DEFAULT/baz').with_ensure('absent') - end - end - - shared_examples_for 'congress_api_paste_ini' do - let :params do - { :congress_api_paste_ini => config_hash } - end - - it 'configures arbitrary congress-api-paste-ini configurations' do - is_expected.to contain_congress_api_paste_ini('DEFAULT/foo').with_value('fooValue') - is_expected.to contain_congress_api_paste_ini('DEFAULT/bar').with_value('barValue') - is_expected.to contain_congress_api_paste_ini('DEFAULT/baz').with_ensure('absent') - end - end - - on_supported_os({ - :supported_os => OSDefaults.get_supported_os - }).each do |os,facts| - context "on #{os}" do - let (:facts) do - facts.merge!(OSDefaults.get_facts()) - end - - it_configures 'congress_config' - it_configures 'congress_api_paste_ini' - end - end -end diff --git a/spec/classes/congress_db_mysql_spec.rb b/spec/classes/congress_db_mysql_spec.rb deleted file mode 100644 index 4d1e6cb..0000000 --- a/spec/classes/congress_db_mysql_spec.rb +++ /dev/null @@ -1,73 +0,0 @@ -require 'spec_helper' - -describe 'congress::db::mysql' do - - let :pre_condition do - 'include mysql::server' - end - - let :required_params do - { :password => 'congresspass', } - end - - shared_examples_for 'congress-db-mysql' do - context 'with only required params' do - let :params do - required_params - end - - it { is_expected.to contain_openstacklib__db__mysql('congress').with( - :user => 'congress', - :password => 'congresspass', - :dbname => 'congress', - :host => '127.0.0.1', - :charset => 'utf8', - :collate => 'utf8_general_ci', - )} - end - - context 'overriding allowed_hosts param to array' do - let :params do - { :allowed_hosts => ['127.0.0.1','%'] }.merge(required_params) - end - - it { is_expected.to contain_openstacklib__db__mysql('congress').with( - :user => 'congress', - :password => 'congresspass', - :dbname => 'congress', - :host => '127.0.0.1', - :charset => 'utf8', - :collate => 'utf8_general_ci', - :allowed_hosts => ['127.0.0.1','%'] - )} - end - - describe 'overriding allowed_hosts param to string' do - let :params do - { :allowed_hosts => '192.168.1.1' }.merge(required_params) - end - - it { is_expected.to contain_openstacklib__db__mysql('congress').with( - :user => 'congress', - :password => 'congresspass', - :dbname => 'congress', - :host => '127.0.0.1', - :charset => 'utf8', - :collate => 'utf8_general_ci', - :allowed_hosts => '192.168.1.1' - )} - end - end - - on_supported_os({ - :supported_os => OSDefaults.get_supported_os - }).each do |os,facts| - context "on #{os}" do - let (:facts) do - facts.merge!(OSDefaults.get_facts()) - end - - it_behaves_like 'congress-db-mysql' - end - end -end diff --git a/spec/classes/congress_db_postgresql_spec.rb b/spec/classes/congress_db_postgresql_spec.rb deleted file mode 100644 index 8d9de6d..0000000 --- a/spec/classes/congress_db_postgresql_spec.rb +++ /dev/null @@ -1,40 +0,0 @@ -require 'spec_helper' - -describe 'congress::db::postgresql' do - - let :pre_condition do - 'include postgresql::server' - end - - let :required_params do - { :password => 'congresspass' } - end - - shared_examples_for 'congress-db-postgresql' do - context 'with only required parameters' do - let :params do - required_params - end - - it { is_expected.to contain_openstacklib__db__postgresql('congress').with( - :user => 'congress', - :password => 'congresspass', - :dbname => 'congress', - :encoding => nil, - :privileges => 'ALL', - )} - end - end - - on_supported_os({ - :supported_os => OSDefaults.get_supported_os - }).each do |os,facts| - context "on #{os}" do - let (:facts) do - facts.merge!(OSDefaults.get_facts({ :concat_basedir => '/var/lib/puppet/concat' })) - end - - it_behaves_like 'congress-db-postgresql' - end - end -end diff --git a/spec/classes/congress_db_spec.rb b/spec/classes/congress_db_spec.rb deleted file mode 100644 index a229c32..0000000 --- a/spec/classes/congress_db_spec.rb +++ /dev/null @@ -1,60 +0,0 @@ -require 'spec_helper' - -describe 'congress::db' do - shared_examples 'congress::db' do - context 'with default parameters' do - it { should contain_class('congress::deps') } - - it { should contain_oslo__db('congress_config').with( - :db_max_retries => '', - :connection => 'sqlite:////var/lib/congress/congress.sqlite', - :connection_recycle_time => '', - :max_pool_size => '', - :max_retries => '', - :retry_interval => '', - :max_overflow => '', - :pool_timeout => '', - )} - end - - context 'with specific parameters' do - let :params do - { - :database_connection => 'mysql+pymysql://congress:congress@localhost/congress', - :database_connection_recycle_time => '3601', - :database_db_max_retries => '-1', - :database_max_retries => '11', - :database_retry_interval => '11', - :database_max_pool_size => '11', - :database_max_overflow => '21', - :database_pool_timeout => '21', - } - end - - it { should contain_class('congress::deps') } - - it { should contain_oslo__db('congress_config').with( - :db_max_retries => '-1', - :connection => 'mysql+pymysql://congress:congress@localhost/congress', - :connection_recycle_time => '3601', - :max_pool_size => '11', - :max_retries => '11', - :retry_interval => '11', - :max_overflow => '21', - :pool_timeout => '21', - )} - end - end - - on_supported_os({ - :supported_os => OSDefaults.get_supported_os - }).each do |os,facts| - context "on #{os}" do - let (:facts) do - facts.merge!(OSDefaults.get_facts()) - end - - it_behaves_like 'congress::db' - end - end -end diff --git a/spec/classes/congress_db_sync_spec.rb b/spec/classes/congress_db_sync_spec.rb deleted file mode 100644 index fdf5d7d..0000000 --- a/spec/classes/congress_db_sync_spec.rb +++ /dev/null @@ -1,41 +0,0 @@ -require 'spec_helper' - -describe 'congress::db::sync' do - - shared_examples_for 'congress-dbsync' do - - it 'runs congress-db-sync' do - is_expected.to contain_exec('congress-db-sync').with( - :command => 'congress-db-manage --config-file /etc/congress/congress.conf upgrade head', - :path => ["/bin", "/usr/bin"], - :refreshonly => true, - :user => 'congress', - :try_sleep => 5, - :tries => 10, - :logoutput => 'on_failure', - :subscribe => ['Anchor[congress::install::end]', - 'Anchor[congress::config::end]', - 'Anchor[congress::dbsync::begin]'], - :notify => 'Anchor[congress::dbsync::end]', - :tag => 'openstack-db', - ) - end - - end - - on_supported_os({ - :supported_os => OSDefaults.get_supported_os - }).each do |os,facts| - context "on #{os}" do - let (:facts) do - facts.merge(OSDefaults.get_facts({ - :os_workers => 8, - :concat_basedir => '/var/lib/puppet/concat' - })) - end - - it_configures 'congress-dbsync' - end - end - -end diff --git a/spec/classes/congress_init_spec.rb b/spec/classes/congress_init_spec.rb deleted file mode 100644 index 324604d..0000000 --- a/spec/classes/congress_init_spec.rb +++ /dev/null @@ -1,243 +0,0 @@ -require 'spec_helper' - -describe 'congress' do - - shared_examples 'congress' do - - context 'with default parameters' do - let :params do - {} - end - - it 'contains deps class' do - is_expected.to contain_class('congress::deps') - end - - it { is_expected.to contain_package('congress-common').with( - :ensure => 'present', - :name => platform_params[:congress_package], - :tag => ['openstack', 'congress-package'] - )} - - it 'configures rabbit' do - is_expected.to contain_congress_config('DEFAULT/transport_url').with_value('') - is_expected.to contain_congress_config('DEFAULT/rpc_response_timeout').with_value('') - is_expected.to contain_congress_config('DEFAULT/control_exchange').with_value('') - is_expected.to contain_congress_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('') - is_expected.to contain_congress_config('oslo_messaging_rabbit/heartbeat_in_pthread').with_value('') - is_expected.to contain_congress_config('oslo_messaging_rabbit/kombu_compression').with_value('') - end - - it { is_expected.to contain_oslo__messaging__notifications('congress_config').with(:transport_url => '') } - it { is_expected.to contain_oslo__messaging__notifications('congress_config').with(:topics => '') } - it { is_expected.to contain_oslo__messaging__notifications('congress_config').with(:driver => '') } - end - - context 'with overridden parameters' do - let :params do - { - :rabbit_ha_queues => true, - :rabbit_heartbeat_timeout_threshold => '60', - :rabbit_heartbeat_rate => '10', - :rabbit_heartbeat_in_pthread => true, - :kombu_compression => 'gzip', - } - end - - it 'configures rabbit' do - is_expected.to contain_congress_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(true) - is_expected.to contain_congress_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('60') - is_expected.to contain_congress_config('oslo_messaging_rabbit/heartbeat_rate').with_value('10') - is_expected.to contain_congress_config('oslo_messaging_rabbit/heartbeat_in_pthread').with_value(true) - is_expected.to contain_congress_config('oslo_messaging_rabbit/kombu_compression').with_value('gzip') - is_expected.to contain_congress_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('') - is_expected.to contain_congress_config('oslo_messaging_rabbit/kombu_failover_strategy').with_value('') - is_expected.to contain_congress_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('') - is_expected.to contain_oslo__messaging__rabbit('congress_config').with( - :rabbit_use_ssl => '', - ) - end - - end - - context 'with default_transport_url parameter' do - let :params do - { - :default_transport_url => 'rabbit://user:pass@host:1234/virtualhost', - :rpc_response_timeout => '120', - :control_exchange => 'congress', - } - end - - it 'configures rabbit' do - is_expected.to contain_congress_config('DEFAULT/transport_url').with_value('rabbit://user:pass@host:1234/virtualhost') - is_expected.to contain_congress_config('DEFAULT/rpc_response_timeout').with_value('120') - is_expected.to contain_congress_config('DEFAULT/control_exchange').with_value('congress') - end - end - - context 'with notification_transport_url parameter' do - let :params do - { - :notification_transport_url => 'rabbit://user:pass@host:1234/virtualhost', - :notification_topics => 'openstack', - :notification_driver => 'messagingv1', - } - end - - it 'configures rabbit' do - is_expected.to contain_oslo__messaging__notifications('congress_config').with( - :transport_url => 'rabbit://user:pass@host:1234/virtualhost' - ) - is_expected.to contain_oslo__messaging__notifications('congress_config').with(:topics => 'openstack') - is_expected.to contain_oslo__messaging__notifications('congress_config').with(:driver => 'messagingv1') - end - end - - - context 'with kombu_reconnect_delay set to 5.0' do - let :params do - { - :kombu_reconnect_delay => '5.0' } - end - - it 'configures rabbit' do - is_expected.to contain_congress_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('5.0') - end - end - - context 'with rabbit_ha_queues set to true' do - let :params do - { - :rabbit_ha_queues => 'true' } - end - - it 'configures rabbit' do - is_expected.to contain_congress_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(true) - end - end - - context 'with amqp_durable_queues parameter' do - let :params do - { - :amqp_durable_queues => 'true' } - end - - it 'configures rabbit' do - is_expected.to contain_congress_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('') - is_expected.to contain_congress_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(true) - is_expected.to contain_oslo__messaging__rabbit('congress_config').with( - :rabbit_use_ssl => '', - ) - end - end - - context 'with rabbit ssl enabled with kombu' do - let :params do - { - :rabbit_use_ssl => true, - :kombu_ssl_ca_certs => '/etc/ca.cert', - :kombu_ssl_certfile => '/etc/certfile', - :kombu_ssl_keyfile => '/etc/key', - :kombu_ssl_version => 'TLSv1', } - end - - it 'configures rabbit' do - is_expected.to contain_oslo__messaging__rabbit('congress_config').with( - :rabbit_use_ssl => true, - :kombu_ssl_ca_certs => '/etc/ca.cert', - :kombu_ssl_certfile => '/etc/certfile', - :kombu_ssl_keyfile => '/etc/key', - :kombu_ssl_version => 'TLSv1', - ) - end - end - - context 'with rabbit ssl enabled without kombu' do - let :params do - { - :rabbit_use_ssl => true, - } - end - - it 'configures rabbit' do - is_expected.to contain_oslo__messaging__rabbit('congress_config').with( - :rabbit_use_ssl => true, - :kombu_ssl_ca_certs => '', - :kombu_ssl_certfile => '', - :kombu_ssl_keyfile => '', - :kombu_ssl_version => '', - ) - end - end - - context 'with amqp default parameters' do - - it 'configures amqp' do - is_expected.to contain_congress_config('oslo_messaging_amqp/server_request_prefix').with_value('') - is_expected.to contain_congress_config('oslo_messaging_amqp/broadcast_prefix').with_value('') - is_expected.to contain_congress_config('oslo_messaging_amqp/group_request_prefix').with_value('') - is_expected.to contain_congress_config('oslo_messaging_amqp/container_name').with_value('') - is_expected.to contain_congress_config('oslo_messaging_amqp/idle_timeout').with_value('') - is_expected.to contain_congress_config('oslo_messaging_amqp/trace').with_value('') - is_expected.to contain_congress_config('oslo_messaging_amqp/ssl_ca_file').with_value('') - is_expected.to contain_congress_config('oslo_messaging_amqp/ssl_cert_file').with_value('') - is_expected.to contain_congress_config('oslo_messaging_amqp/ssl_key_file').with_value('') - is_expected.to contain_congress_config('oslo_messaging_amqp/ssl_key_password').with_value('') - is_expected.to contain_congress_config('oslo_messaging_amqp/allow_insecure_clients').with_value('') - is_expected.to contain_congress_config('oslo_messaging_amqp/sasl_mechanisms').with_value('') - is_expected.to contain_congress_config('oslo_messaging_amqp/sasl_config_dir').with_value('') - is_expected.to contain_congress_config('oslo_messaging_amqp/sasl_config_name').with_value('') - is_expected.to contain_congress_config('oslo_messaging_amqp/username').with_value('') - is_expected.to contain_congress_config('oslo_messaging_amqp/password').with_value('') - end - end - - context 'with overridden amqp parameters' do - let :params do - { - :amqp_idle_timeout => '60', - :amqp_trace => true, - :amqp_ssl_ca_file => '/etc/ca.cert', - :amqp_ssl_cert_file => '/etc/certfile', - :amqp_ssl_key_file => '/etc/key', - :amqp_username => 'amqp_user', - :amqp_password => 'password', - } - end - - it 'configures amqp' do - is_expected.to contain_congress_config('oslo_messaging_amqp/idle_timeout').with_value('60') - is_expected.to contain_congress_config('oslo_messaging_amqp/trace').with_value('true') - is_expected.to contain_congress_config('oslo_messaging_amqp/ssl_ca_file').with_value('/etc/ca.cert') - is_expected.to contain_congress_config('oslo_messaging_amqp/ssl_cert_file').with_value('/etc/certfile') - is_expected.to contain_congress_config('oslo_messaging_amqp/ssl_key_file').with_value('/etc/key') - is_expected.to contain_congress_config('oslo_messaging_amqp/username').with_value('amqp_user') - is_expected.to contain_congress_config('oslo_messaging_amqp/password').with_value('password') - end - end - end - - on_supported_os({ - :supported_os => OSDefaults.get_supported_os - }).each do |os,facts| - context "on #{os}" do - let (:facts) do - facts.merge!(OSDefaults.get_facts()) - end - - let(:platform_params) do - case facts[:osfamily] - when 'Debian' - { :congress_package => 'congress-server' } - when 'RedHat' - { :congress_package => 'openstack-congress' } - end - end - it_behaves_like 'congress' - - end - end - - -end diff --git a/spec/classes/congress_keystone_auth_spec.rb b/spec/classes/congress_keystone_auth_spec.rb deleted file mode 100644 index ec529b3..0000000 --- a/spec/classes/congress_keystone_auth_spec.rb +++ /dev/null @@ -1,128 +0,0 @@ -# -# Unit tests for congress::keystone::auth -# - -require 'spec_helper' - -describe 'congress::keystone::auth' do - shared_examples_for 'congress-keystone-auth' do - context 'with default class parameters' do - let :params do - { :password => 'congress_password', - :tenant => 'foobar' } - end - - it { is_expected.to contain_keystone_user('congress').with( - :ensure => 'present', - :password => 'congress_password', - ) } - - it { is_expected.to contain_keystone_user_role('congress@foobar').with( - :ensure => 'present', - :roles => ['admin'] - )} - - it { is_expected.to contain_keystone_service('congress::policy').with( - :ensure => 'present', - :description => 'congress Policy Service' - ) } - - it { is_expected.to contain_keystone_endpoint('RegionOne/congress::policy').with( - :ensure => 'present', - :public_url => 'http://127.0.0.1:1789', - :admin_url => 'http://127.0.0.1:1789', - :internal_url => 'http://127.0.0.1:1789', - ) } - end - - context 'when overriding URL parameters' do - let :params do - { :password => 'congress_password', - :public_url => 'https://10.10.10.10:80', - :internal_url => 'http://10.10.10.11:81', - :admin_url => 'http://10.10.10.12:81', } - end - - it { is_expected.to contain_keystone_endpoint('RegionOne/congress::policy').with( - :ensure => 'present', - :public_url => 'https://10.10.10.10:80', - :internal_url => 'http://10.10.10.11:81', - :admin_url => 'http://10.10.10.12:81', - ) } - end - - context 'when overriding auth name' do - let :params do - { :password => 'foo', - :auth_name => 'congressy' } - end - - it { is_expected.to contain_keystone_user('congressy') } - it { is_expected.to contain_keystone_user_role('congressy@services') } - it { is_expected.to contain_keystone_service('congress::policy') } - it { is_expected.to contain_keystone_endpoint('RegionOne/congress::policy') } - end - - context 'when overriding service name' do - let :params do - { :service_name => 'congress_service', - :auth_name => 'congress', - :password => 'congress_password' } - end - - it { is_expected.to contain_keystone_user('congress') } - it { is_expected.to contain_keystone_user_role('congress@services') } - it { is_expected.to contain_keystone_service('congress_service::policy') } - it { is_expected.to contain_keystone_endpoint('RegionOne/congress_service::policy') } - end - - context 'when disabling user configuration' do - - let :params do - { - :password => 'congress_password', - :configure_user => false - } - end - - it { is_expected.not_to contain_keystone_user('congress') } - it { is_expected.to contain_keystone_user_role('congress@services') } - it { is_expected.to contain_keystone_service('congress::policy').with( - :ensure => 'present', - :description => 'congress Policy Service' - ) } - - end - - context 'when disabling user and user role configuration' do - - let :params do - { - :password => 'congress_password', - :configure_user => false, - :configure_user_role => false - } - end - - it { is_expected.not_to contain_keystone_user('congress') } - it { is_expected.not_to contain_keystone_user_role('congress@services') } - it { is_expected.to contain_keystone_service('congress::policy').with( - :ensure => 'present', - :description => 'congress Policy Service' - ) } - - end - end - - on_supported_os({ - :supported_os => OSDefaults.get_supported_os - }).each do |os,facts| - context "on #{os}" do - let (:facts) do - facts.merge!(OSDefaults.get_facts()) - end - - it_behaves_like 'congress-keystone-auth' - end - end -end diff --git a/spec/classes/congress_keystone_authtoken_spec.rb b/spec/classes/congress_keystone_authtoken_spec.rb deleted file mode 100644 index ed46608..0000000 --- a/spec/classes/congress_keystone_authtoken_spec.rb +++ /dev/null @@ -1,146 +0,0 @@ -require 'spec_helper' - -describe 'congress::keystone::authtoken' do - - let :params do - { :password => 'congress_password', } - end - - shared_examples 'congress authtoken' do - - context 'without required password parameter' do - before { params.delete(:password) } - it { expect { is_expected.to raise_error(Puppet::Error) } } - end - - context 'with default parameters' do - - it 'configure keystone_authtoken' do - is_expected.to contain_congress_config('keystone_authtoken/username').with_value('congress') - is_expected.to contain_congress_config('keystone_authtoken/password').with_value('congress_password') - is_expected.to contain_congress_config('keystone_authtoken/auth_url').with_value('http://localhost:5000') - is_expected.to contain_congress_config('keystone_authtoken/project_name').with_value('services') - is_expected.to contain_congress_config('keystone_authtoken/user_domain_name').with_value('Default') - is_expected.to contain_congress_config('keystone_authtoken/project_domain_name').with_value('Default') - is_expected.to contain_congress_config('keystone_authtoken/insecure').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/auth_section').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/auth_type').with_value('password') - is_expected.to contain_congress_config('keystone_authtoken/www_authenticate_uri').with_value('http://localhost:5000') - is_expected.to contain_congress_config('keystone_authtoken/auth_version').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/cache').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/cafile').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/certfile').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/delay_auth_decision').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/enforce_token_bind').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/http_connect_timeout').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/http_request_max_retries').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/include_service_catalog').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/keyfile').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/memcache_pool_conn_get_timeout').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/memcache_pool_dead_retry').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/memcache_pool_maxsize').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/memcache_pool_socket_timeout').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/memcache_pool_unused_timeout').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/memcache_secret_key').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/memcache_security_strategy').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/memcache_use_advanced_pool').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/memcached_servers').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/region_name').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/token_cache_time').with_value('') - is_expected.to contain_congress_config('keystone_authtoken/service_token_roles_required').with_value('') - end - end - - context 'when overriding parameters' do - before do - params.merge!({ - :www_authenticate_uri => 'https://10.0.0.1:9999/', - :username => 'myuser', - :password => 'mypasswd', - :auth_url => 'https://127.0.0.1:5000', - :project_name => 'service_project', - :user_domain_name => 'domainX', - :project_domain_name => 'domainX', - :insecure => false, - :auth_section => 'new_section', - :auth_type => 'password', - :auth_version => 'v3', - :cache => 'somevalue', - :cafile => '/opt/stack/data/cafile.pem', - :certfile => 'certfile.crt', - :delay_auth_decision => false, - :enforce_token_bind => 'permissive', - :http_connect_timeout => '300', - :http_request_max_retries => '3', - :include_service_catalog => true, - :keyfile => 'keyfile', - :memcache_pool_conn_get_timeout => '9', - :memcache_pool_dead_retry => '302', - :memcache_pool_maxsize => '11', - :memcache_pool_socket_timeout => '2', - :memcache_pool_unused_timeout => '61', - :memcache_secret_key => 'secret_key', - :memcache_security_strategy => 'ENCRYPT', - :memcache_use_advanced_pool => true, - :memcached_servers => ['memcached01:11211','memcached02:11211'], - :manage_memcache_package => true, - :region_name => 'region2', - :token_cache_time => '301', - :service_token_roles_required => false, - }) - end - - it 'configure keystone_authtoken' do - is_expected.to contain_congress_config('keystone_authtoken/www_authenticate_uri').with_value('https://10.0.0.1:9999/') - is_expected.to contain_congress_config('keystone_authtoken/username').with_value(params[:username]) - is_expected.to contain_congress_config('keystone_authtoken/password').with_value(params[:password]).with_secret(true) - is_expected.to contain_congress_config('keystone_authtoken/auth_url').with_value(params[:auth_url]) - is_expected.to contain_congress_config('keystone_authtoken/project_name').with_value(params[:project_name]) - is_expected.to contain_congress_config('keystone_authtoken/user_domain_name').with_value(params[:user_domain_name]) - is_expected.to contain_congress_config('keystone_authtoken/project_domain_name').with_value(params[:project_domain_name]) - is_expected.to contain_congress_config('keystone_authtoken/insecure').with_value(params[:insecure]) - is_expected.to contain_congress_config('keystone_authtoken/auth_section').with_value(params[:auth_section]) - is_expected.to contain_congress_config('keystone_authtoken/auth_type').with_value(params[:auth_type]) - is_expected.to contain_congress_config('keystone_authtoken/auth_version').with_value(params[:auth_version]) - is_expected.to contain_congress_config('keystone_authtoken/cache').with_value(params[:cache]) - is_expected.to contain_congress_config('keystone_authtoken/cafile').with_value(params[:cafile]) - is_expected.to contain_congress_config('keystone_authtoken/certfile').with_value(params[:certfile]) - is_expected.to contain_congress_config('keystone_authtoken/delay_auth_decision').with_value(params[:delay_auth_decision]) - is_expected.to contain_congress_config('keystone_authtoken/enforce_token_bind').with_value(params[:enforce_token_bind]) - is_expected.to contain_congress_config('keystone_authtoken/http_connect_timeout').with_value(params[:http_connect_timeout]) - is_expected.to contain_congress_config('keystone_authtoken/http_request_max_retries').with_value(params[:http_request_max_retries]) - is_expected.to contain_congress_config('keystone_authtoken/include_service_catalog').with_value(params[:include_service_catalog]) - is_expected.to contain_congress_config('keystone_authtoken/keyfile').with_value(params[:keyfile]) - is_expected.to contain_congress_config('keystone_authtoken/memcache_pool_conn_get_timeout').with_value(params[:memcache_pool_conn_get_timeout]) - is_expected.to contain_congress_config('keystone_authtoken/memcache_pool_dead_retry').with_value(params[:memcache_pool_dead_retry]) - is_expected.to contain_congress_config('keystone_authtoken/memcache_pool_maxsize').with_value(params[:memcache_pool_maxsize]) - is_expected.to contain_congress_config('keystone_authtoken/memcache_pool_socket_timeout').with_value(params[:memcache_pool_socket_timeout]) - is_expected.to contain_congress_config('keystone_authtoken/memcache_pool_unused_timeout').with_value(params[:memcache_pool_unused_timeout]) - is_expected.to contain_congress_config('keystone_authtoken/memcache_secret_key').with_value(params[:memcache_secret_key]) - is_expected.to contain_congress_config('keystone_authtoken/memcache_security_strategy').with_value(params[:memcache_security_strategy]) - is_expected.to contain_congress_config('keystone_authtoken/memcache_use_advanced_pool').with_value(params[:memcache_use_advanced_pool]) - is_expected.to contain_congress_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211') - is_expected.to contain_congress_config('keystone_authtoken/region_name').with_value(params[:region_name]) - is_expected.to contain_congress_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) - is_expected.to contain_congress_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required]) - end - - it 'installs python memcache package' do - is_expected.to contain_package('python-memcache') - end - end - end - - on_supported_os({ - :supported_os => OSDefaults.get_supported_os - }).each do |os,facts| - context "on #{os}" do - let (:facts) do - facts.merge!(OSDefaults.get_facts()) - end - - it_configures 'congress authtoken' - end - end - -end diff --git a/spec/classes/congress_logging_spec.rb b/spec/classes/congress_logging_spec.rb deleted file mode 100644 index fa768ba..0000000 --- a/spec/classes/congress_logging_spec.rb +++ /dev/null @@ -1,133 +0,0 @@ -require 'spec_helper' - -describe 'congress::logging' do - - let :params do - { - } - end - - let :log_params do - { - :logging_context_format_string => '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s', - :logging_default_format_string => '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s', - :logging_debug_format_suffix => '%(funcName)s %(pathname)s:%(lineno)d', - :logging_exception_prefix => '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s', - :log_config_append => '/etc/congress/logging.conf', - :publish_errors => true, - :default_log_levels => { - 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', - 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN', - 'requests.packages.urllib3.connectionpool' => 'WARN' }, - :fatal_deprecations => true, - :instance_format => '[instance: %(uuid)s] ', - :instance_uuid_format => '[instance: %(uuid)s] ', - :log_date_format => '%Y-%m-%d %H:%M:%S', - :use_syslog => true, - :use_json => true, - :use_journal => true, - :use_stderr => false, - :syslog_log_facility => 'LOG_FOO', - :log_dir => '/var/log', - :log_file => '/var/tmp/congress_random.log', - :debug => true, - } - end - - shared_examples_for 'congress-logging' do - - context 'with basic logging options and default settings' do - it_configures 'basic default logging settings' - end - - context 'with basic logging options and non-default settings' do - before { params.merge!( log_params ) } - it_configures 'basic non-default logging settings' - end - - context 'with extended logging options' do - before { params.merge!( log_params ) } - it_configures 'logging params set' - end - - context 'without extended logging options' do - it_configures 'logging params unset' - end - - end - - shared_examples 'basic default logging settings' do - it 'configures congress logging settings with default values' do - is_expected.to contain_oslo__log('congress_config').with( - :use_syslog => '', - :use_json => '', - :use_journal => '', - :use_stderr => '', - :syslog_log_facility => '', - :log_dir => '/var/log/congress', - :log_file => '/var/log/congress/congress.log', - :debug => '', - ) - end - end - - shared_examples 'basic non-default logging settings' do - it 'configures congress logging settings with non-default values' do - is_expected.to contain_oslo__log('congress_config').with( - :use_syslog => true, - :use_json => true, - :use_journal => true, - :use_stderr => false, - :syslog_log_facility => 'LOG_FOO', - :log_dir => '/var/log', - :log_file => '/var/tmp/congress_random.log', - :debug => true, - ) - end - end - - shared_examples_for 'logging params set' do - it 'enables logging params' do - is_expected.to contain_oslo__log('congress_config').with( - :logging_context_format_string => - '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s', - :logging_default_format_string => '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s', - :logging_debug_format_suffix => '%(funcName)s %(pathname)s:%(lineno)d', - :logging_exception_prefix => '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s', - :log_config_append => '/etc/congress/logging.conf', - :publish_errors => true, - :default_log_levels => { - 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', - 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN', - 'requests.packages.urllib3.connectionpool' => 'WARN' }, - :fatal_deprecations => true, - :instance_format => '[instance: %(uuid)s] ', - :instance_uuid_format => '[instance: %(uuid)s] ', - :log_date_format => '%Y-%m-%d %H:%M:%S', - ) - end - end - - shared_examples_for 'logging params unset' do - [ :logging_context_format_string, :logging_default_format_string, - :logging_debug_format_suffix, :logging_exception_prefix, - :log_config_append, :publish_errors, - :default_log_levels, :fatal_deprecations, - :instance_format, :instance_uuid_format, - :log_date_format, ].each { |param| - it { is_expected.to contain_oslo__log('congress_config').with("#{param}" => '') } - } - end - - on_supported_os({ - :supported_os => OSDefaults.get_supported_os - }).each do |os,facts| - context "on #{os}" do - let (:facts) do - facts.merge!(OSDefaults.get_facts()) - end - - it_behaves_like 'congress-logging' - end - end -end diff --git a/spec/classes/congress_policy_spec.rb b/spec/classes/congress_policy_spec.rb deleted file mode 100644 index d63b22f..0000000 --- a/spec/classes/congress_policy_spec.rb +++ /dev/null @@ -1,42 +0,0 @@ -require 'spec_helper' - -describe 'congress::policy' do - - shared_examples_for 'congress policies' do - let :params do - { - :policy_path => '/etc/congress/policy.json', - :policies => { - 'context_is_admin' => { - 'key' => 'context_is_admin', - 'value' => 'foo:bar' - } - } - } - end - - it 'set up the policies' do - is_expected.to contain_openstacklib__policy__base('context_is_admin').with({ - :key => 'context_is_admin', - :value => 'foo:bar', - :file_user => 'root', - :file_group => 'congress', - }) - is_expected.to contain_oslo__policy('congress_config').with( - :policy_file => '/etc/congress/policy.json', - ) - end - end - - on_supported_os({ - :supported_os => OSDefaults.get_supported_os - }).each do |os,facts| - context "on #{os}" do - let (:facts) do - facts.merge!(OSDefaults.get_facts()) - end - - it_configures 'congress policies' - end - end -end diff --git a/spec/classes/congress_server_spec.rb b/spec/classes/congress_server_spec.rb deleted file mode 100644 index 5f40d09..0000000 --- a/spec/classes/congress_server_spec.rb +++ /dev/null @@ -1,70 +0,0 @@ -require 'spec_helper' - -describe 'congress::server' do - - let :pre_condition do - "class { 'congress::keystone::authtoken': - password =>'foo', - } - class {'::congress': }" - end - - let :params do - { :enabled => true, - :manage_service => true, - :bind_host => '0.0.0.0', - :bind_port => '1789' - } - end - - shared_examples_for 'congress::server' do - - it { is_expected.to contain_class('congress::deps') } - it { is_expected.to contain_class('congress::params') } - it { is_expected.to contain_class('congress::policy') } - - it 'configures api' do - is_expected.to contain_congress_config('DEFAULT/bind_host').with_value( params[:bind_host] ) - is_expected.to contain_congress_config('DEFAULT/bind_port').with_value( params[:bind_port] ) - end - - [{:enabled => true}, {:enabled => false}].each do |param_hash| - context "when service should be #{param_hash[:enabled] ? 'enabled' : 'disabled'}" do - before do - params.merge!(param_hash) - end - - it 'configures congress-server service' do - is_expected.to contain_service('congress-server').with( - :ensure => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped', - :name => platform_params[:congress_service], - :enable => params[:enabled], - :tag => 'congress-service', - ) - end - end - end - - end - - on_supported_os({ - :supported_os => OSDefaults.get_supported_os - }).each do |os,facts| - context "on #{os}" do - let (:facts) do - facts.merge!(OSDefaults.get_facts()) - end - - let(:platform_params) do - case facts[:osfamily] - when 'Debian' - { :congress_service => 'congress-server' } - when 'RedHat' - { :congress_service => 'openstack-congress-server' } - end - end - - it_configures 'congress::server' - end - end -end diff --git a/spec/shared_examples.rb b/spec/shared_examples.rb deleted file mode 100644 index fec0eac..0000000 --- a/spec/shared_examples.rb +++ /dev/null @@ -1,5 +0,0 @@ -shared_examples_for "a Puppet::Error" do |description| - it "with message matching #{description.inspect}" do - expect { is_expected.to have_class_count(1) }.to raise_error(Puppet::Error, description) - end -end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb deleted file mode 100644 index cad00b1..0000000 --- a/spec/spec_helper.rb +++ /dev/null @@ -1,10 +0,0 @@ -require 'puppetlabs_spec_helper/module_spec_helper' -require 'shared_examples' -require 'puppet-openstack_spec_helper/facts' - -RSpec.configure do |c| - c.alias_it_should_behave_like_to :it_configures, 'configures' - c.alias_it_should_behave_like_to :it_raises, 'raises' -end - -at_exit { RSpec::Puppet::Coverage.report! } diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb deleted file mode 100644 index 9196bc9..0000000 --- a/spec/spec_helper_acceptance.rb +++ /dev/null @@ -1 +0,0 @@ -require 'puppet-openstack_spec_helper/beaker_spec_helper' diff --git a/spec/unit/provider/congress_api_paste_ini/ini_setting_spec.rb b/spec/unit/provider/congress_api_paste_ini/ini_setting_spec.rb deleted file mode 100644 index a42edbb..0000000 --- a/spec/unit/provider/congress_api_paste_ini/ini_setting_spec.rb +++ /dev/null @@ -1,29 +0,0 @@ -# -# these tests are a little concerning b/c they are hacking around the -# modulepath, so these tests will not catch issues that may eventually arise -# related to loading these plugins. -# I could not, for the life of me, figure out how to programatcally set the modulepath -$LOAD_PATH.push( - File.join( - File.dirname(__FILE__), - '..', - '..', - '..', - 'fixtures', - 'modules', - 'inifile', - 'lib') -) -require 'spec_helper' -provider_class = Puppet::Type.type(:congress_api_paste_ini).provider(:ini_setting) -describe provider_class do - - it 'should allow setting to be set explicitly' do - resource = Puppet::Type::Congress_api_paste_ini.new( - {:name => 'dude/foo', :value => 'bar'} - ) - provider = provider_class.new(resource) - expect(provider.section).to eq('dude') - expect(provider.setting).to eq('foo') - end -end diff --git a/spec/unit/provider/congress_config/ini_setting_spec.rb b/spec/unit/provider/congress_config/ini_setting_spec.rb deleted file mode 100644 index 17b1d32..0000000 --- a/spec/unit/provider/congress_config/ini_setting_spec.rb +++ /dev/null @@ -1,68 +0,0 @@ -# -# these tests are a little concerning b/c they are hacking around the -# modulepath, so these tests will not catch issues that may eventually arise -# related to loading these plugins. -# I could not, for the life of me, figure out how to programatcally set the modulepath -$LOAD_PATH.push( - File.join( - File.dirname(__FILE__), - '..', - '..', - '..', - 'fixtures', - 'modules', - 'inifile', - 'lib') -) -$LOAD_PATH.push( - File.join( - File.dirname(__FILE__), - '..', - '..', - '..', - 'fixtures', - 'modules', - 'openstacklib', - 'lib') -) -require 'spec_helper' -provider_class = Puppet::Type.type(:congress_config).provider(:ini_setting) -describe provider_class do - - it 'should default to the default setting when no other one is specified' do - resource = Puppet::Type::Congress_config.new( - {:name => 'DEFAULT/foo', :value => 'bar'} - ) - provider = provider_class.new(resource) - expect(provider.section).to eq('DEFAULT') - expect(provider.setting).to eq('foo') - end - - it 'should allow setting to be set explicitly' do - resource = Puppet::Type::Congress_config.new( - {:name => 'dude/foo', :value => 'bar'} - ) - provider = provider_class.new(resource) - expect(provider.section).to eq('dude') - expect(provider.setting).to eq('foo') - end - - it 'should ensure absent when is specified as a value' do - resource = Puppet::Type::Congress_config.new( - {:name => 'dude/foo', :value => ''} - ) - provider = provider_class.new(resource) - provider.exists? - expect(resource[:ensure]).to eq :absent - end - - it 'should ensure absent when value matches ensure_absent_val' do - resource = Puppet::Type::Congress_config.new( - {:name => 'dude/foo', :value => 'foo', :ensure_absent_val => 'foo' } - ) - provider = provider_class.new(resource) - provider.exists? - expect(resource[:ensure]).to eq :absent - end - -end diff --git a/spec/unit/type/congress_api_paste_ini_spec.rb b/spec/unit/type/congress_api_paste_ini_spec.rb deleted file mode 100644 index bc3ba49..0000000 --- a/spec/unit/type/congress_api_paste_ini_spec.rb +++ /dev/null @@ -1,34 +0,0 @@ -require 'spec_helper' -# this hack is required for now to ensure that the path is set up correctly -# to retrieve the parent provider -$LOAD_PATH.push( - File.join( - File.dirname(__FILE__), - '..', - '..', - 'fixtures', - 'modules', - 'inifile', - 'lib') -) -require 'puppet/type/congress_api_paste_ini' -describe 'Puppet::Type.type(:congress_api_paste_ini)' do - before :each do - @congress_api_paste_ini = Puppet::Type.type(:congress_api_paste_ini).new(:name => 'DEFAULT/foo', :value => 'bar') - end - it 'should accept a valid value' do - @congress_api_paste_ini[:value] = 'bar' - expect(@congress_api_paste_ini[:value]).to eq('bar') - end - - it 'should autorequire the package that install the file' do - catalog = Puppet::Resource::Catalog.new - anchor = Puppet::Type.type(:anchor).new(:name => 'congress::install::end') - catalog.add_resource anchor, @congress_api_paste_ini - dependency = @congress_api_paste_ini.autorequire - expect(dependency.size).to eq(1) - expect(dependency[0].target).to eq(@congress_api_paste_ini) - expect(dependency[0].source).to eq(anchor) - end - -end diff --git a/spec/unit/type/congress_config_spec.rb b/spec/unit/type/congress_config_spec.rb deleted file mode 100644 index ee22b1c..0000000 --- a/spec/unit/type/congress_config_spec.rb +++ /dev/null @@ -1,64 +0,0 @@ -require 'puppet' -require 'puppet/type/congress_config' -describe 'Puppet::Type.type(:congress_config)' do - before :each do - @congress_config = Puppet::Type.type(:congress_config).new(:name => 'DEFAULT/foo', :value => 'bar') - end - - it 'should require a name' do - expect { - Puppet::Type.type(:congress_config).new({}) - }.to raise_error(Puppet::Error, 'Title or name must be provided') - end - - it 'should not expect a name with whitespace' do - expect { - Puppet::Type.type(:congress_config).new(:name => 'f oo') - }.to raise_error(Puppet::Error, /Parameter name failed/) - end - - it 'should fail when there is no section' do - expect { - Puppet::Type.type(:congress_config).new(:name => 'foo') - }.to raise_error(Puppet::Error, /Parameter name failed/) - end - - it 'should not require a value when ensure is absent' do - Puppet::Type.type(:congress_config).new(:name => 'DEFAULT/foo', :ensure => :absent) - end - - it 'should accept a valid value' do - @congress_config[:value] = 'bar' - expect(@congress_config[:value]).to eq('bar') - end - - it 'should not accept a value with whitespace' do - @congress_config[:value] = 'b ar' - expect(@congress_config[:value]).to eq('b ar') - end - - it 'should accept valid ensure values' do - @congress_config[:ensure] = :present - expect(@congress_config[:ensure]).to eq(:present) - @congress_config[:ensure] = :absent - expect(@congress_config[:ensure]).to eq(:absent) - end - - it 'should not accept invalid ensure values' do - expect { - @congress_config[:ensure] = :latest - }.to raise_error(Puppet::Error, /Invalid value/) - end - - it 'should autorequire the package that install the file' do - catalog = Puppet::Resource::Catalog.new - anchor = Puppet::Type.type(:anchor).new(:name => 'congress::install::end') - catalog.add_resource anchor, @congress_config - dependency = @congress_config.autorequire - expect(dependency.size).to eq(1) - expect(dependency[0].target).to eq(@congress_config) - expect(dependency[0].source).to eq(anchor) - end - - -end diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 5099a0d..0000000 --- a/tox.ini +++ /dev/null @@ -1,13 +0,0 @@ -[tox] -minversion = 3.1 -skipsdist = True -envlist = releasenotes -ignore_basepython_conflict = True - -[testenv] -basepython = python3 -install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages} - -[testenv:releasenotes] -deps = -r{toxinidir}/doc/requirements.txt -commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html