diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ea90996..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -Gemfile.lock -.bundled_gems/ -log/ -junit/ -.vagrant/ diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 019213a..0000000 --- a/Gemfile +++ /dev/null @@ -1,15 +0,0 @@ -source 'https://rubygems.org' - -if File.exists?('/home/zuul/src/git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper') - gem_checkout_method = {:path => '/home/zuul/src/git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper'} -else - gem_checkout_method = {:git => 'https://git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper'} -end -gem_checkout_method[:require] = false - -group :development, :test, :system_tests do - gem 'puppet-openstack_infra_spec_helper', - gem_checkout_method -end - -# vim:ft=ruby diff --git a/LICENSE b/LICENSE deleted file mode 100644 index d645695..0000000 --- a/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/README.md b/README.md index 8692554..ec889a9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ -# OpenStack Bandersnatch Module +This project is no longer maintained. -## Overview +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". -Installs and configures Bandersnatch. +For any further questions, please email +service-discuss@lists.opendev.org or join #opendev on OFTC. diff --git a/Rakefile b/Rakefile deleted file mode 100644 index ff1f0d7..0000000 --- a/Rakefile +++ /dev/null @@ -1,8 +0,0 @@ -require 'rubygems' -require 'puppetlabs_spec_helper/rake_tasks' -require 'puppet-lint/tasks/puppet-lint' -PuppetLint.configuration.fail_on_warnings = true -PuppetLint.configuration.send('disable_80chars') -PuppetLint.configuration.send('disable_autoloader_layout') -PuppetLint.configuration.send('disable_class_inherits_from_params_class') -PuppetLint.configuration.send('disable_class_parameter_defaults') diff --git a/bindep.txt b/bindep.txt deleted file mode 100644 index 7cdd58e..0000000 --- a/bindep.txt +++ /dev/null @@ -1,11 +0,0 @@ -# This is a cross-platform list tracking distribution packages needed by tests; -# see http://docs.openstack.org/infra/bindep/ for additional information. - -libxml2-devel [test platform:rpm] -libxml2-dev [test platform:dpkg] -libxslt-devel [test platform:rpm] -libxslt1-dev [test platform:dpkg] -ruby-devel [test platform:rpm] -ruby-dev [test platform:dpkg] -zlib1g-dev [test platform:dpkg] -zlib-devel [test platform:rpm] diff --git a/files/robots.txt b/files/robots.txt deleted file mode 100644 index 1f53798..0000000 --- a/files/robots.txt +++ /dev/null @@ -1,2 +0,0 @@ -User-agent: * -Disallow: / diff --git a/files/run_bandersnatch.py b/files/run_bandersnatch.py deleted file mode 100644 index 92c02a2..0000000 --- a/files/run_bandersnatch.py +++ /dev/null @@ -1,82 +0,0 @@ -#!/usr/bin/python -# Copyright (c) 2014 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import logging -import os -import re -import requests -import subprocess -import time -import urlparse - - -def setup_logging(logger): - ch = logging.StreamHandler() - formatter = logging.Formatter( - '%(asctime)s %(levelname)s: %(message)s') - ch.setFormatter(formatter) - logger.setLevel(logging.INFO) - logger.addHandler(ch) - - -def normalize(name): - return re.sub(r"[-_.]+", "-", name).lower() - - -def get_purge_urls(url): - res = urlparse.urlparse(url) - ret = [url] - ret.append(os.path.join(url, 'json')) - m = re.match('^/simple/([^/$]*)', res[2]) - if m: - package = normalize(m.group(1)) - new_url = list(res[:]) - new_url[2] = '/simple/%s/' % package - ret.append(urlparse.urlunparse(new_url)) - new_url[2] = '/simple/%s/json' % package - ret.append(urlparse.urlunparse(new_url)) - return ret - - -def main(): - logger = logging.getLogger('bandersnatch') - setup_logging(logger) - - stale = dict() - try: - output = subprocess.check_output( - ['bandersnatch', 'mirror'], stderr=subprocess.STDOUT) - except subprocess.CalledProcessError as e: - print e.output - raise - - for line in output.split('\n'): - print(line) - if 'Expected PyPI serial' in line: - url = line.split("for request ")[1].split()[0] - stale[url] = True - for stale_url in stale.keys(): - logger.info('Purging URLs for stale request %s' % stale_url) - for url in get_purge_urls(stale_url): - logger.info('Purging %s' % url) - response = requests.request('PURGE', url) - if not response.ok: - logger.error('Failed to purge %s: %s' % (url, response.text)) - time.sleep(0.1) - - -if __name__ == '__main__': - main() diff --git a/manifests/cron.pp b/manifests/cron.pp deleted file mode 100644 index c5262d1..0000000 --- a/manifests/cron.pp +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2015 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. -# -# = Class: bandersnatch::cron -# -# Class to set up bandersnatch cron job. -# -class bandersnatch::cron ( - $user = 'root', -) { - - cron { 'bandersnatch': - user => $user, - minute => '*/5', - command => 'flock -n /var/run/bandersnatch/mirror.lock timeout -k 2m 30m run-bandersnatch >>/var/log/bandersnatch/mirror.log 2>&1', - environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin', - } -} diff --git a/manifests/httpd.pp b/manifests/httpd.pp deleted file mode 100644 index 82f3720..0000000 --- a/manifests/httpd.pp +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2015 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. -# -# = Class: bandersnatch::httpd -# -# Class to set up bandersnatch web hosting. -# -class bandersnatch::httpd ( - $vhost_name, - $group = 'root', - $mirror_root = '/srv/static/mirror', - $user = 'root', -) { - include ::httpd - - ::httpd::vhost { $vhost_name: - port => 80, - priority => '50', - docroot => "${mirror_root}/web", - require => File["${mirror_root}/web"], - } - - file { "${mirror_root}/web/robots.txt": - ensure => present, - owner => $user, - group => $group, - mode => '0444', - source => 'puppet:///modules/bandersnatch/robots.txt', - require => File["${mirror_root}/web"], - } -} diff --git a/manifests/init.pp b/manifests/init.pp deleted file mode 100644 index cf7f722..0000000 --- a/manifests/init.pp +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 2015 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. -# -# = Class: bandersnatch -# -# Class to install common bandersnatch items. -# -class bandersnatch ( - $bandersnatch_source = 'pip', -) { - - if ! defined(Package['mercurial']) { - package { 'mercurial': - ensure => present, - } - } - - if ($bandersnatch_source == 'pip') { - package { 'bandersnatch': - # Bandersnatch v2 only supports python and starts at 3.5 - # We'll need to install python3 and upgrade to xenial before we can - # use that. - ensure => '1.11', - provider => openstack_pip, - } - } elsif ($bandersnatch_source == 'pip3') { - package { 'bandersnatch': - ensure => '2.2.0', - provider => pip3, - } - } else { - vcsrepo { '/opt/bandersnatch': - ensure => latest, - provider => hg, - source => $bandersnatch_source, - } - - exec { 'install_bandersnatch' : - command => 'pip install -U /opt/bandersnatch', - path => '/usr/local/bin:/usr/bin:/bin/', - refreshonly => true, - subscribe => Vcsrepo['/opt/bandersnatch'], - require => [ - Class['pip'], - ], - } - } - - file { '/var/log/bandersnatch': - ensure => directory, - } - - file { '/var/run/bandersnatch': - ensure => directory, - } - - include ::logrotate - logrotate::file { 'bandersnatch': - log => '/var/log/bandersnatch/mirror.log', - options => [ - 'compress', - 'copytruncate', - 'missingok', - 'rotate 7', - 'daily', - 'notifempty', - ], - } - - file { '/usr/local/bin/run-bandersnatch': - ensure => present, - owner => 'root', - group => 'root', - mode => '0755', - source => 'puppet:///modules/bandersnatch/run_bandersnatch.py', - } -} diff --git a/manifests/mirror.pp b/manifests/mirror.pp deleted file mode 100644 index 8c8501f..0000000 --- a/manifests/mirror.pp +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2015 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. -# -# = Class: bandersnatch::mirror -# -# Class to set up bandersnatch mirroring. -# -class bandersnatch::mirror ( - $group = 'root', - $hash_index = false, - $package_blacklist = [], - $mirror_root = '/srv/static/mirror', - $static_root = '/srv/static', - $user = 'root', -) { - - if ! defined(File[$static_root]) { - file { $static_root: - ensure => directory, - } - } - - file { $mirror_root: - ensure => directory, - owner => $user, - group => $group, - require => File[$static_root], - } - - file { "${mirror_root}/web": - ensure => directory, - owner => $user, - group => $group, - require => File[$mirror_root], - } - - file { '/etc/bandersnatch.conf': - ensure => present, - content => template('bandersnatch/bandersnatch.conf.erb'), - } -} diff --git a/metadata.json b/metadata.json deleted file mode 100644 index 68f81a5..0000000 --- a/metadata.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "openstackci-bandersnatch", - "version": "0.0.1", - "author": "Openstack CI", - "summary": "Puppet module for Bandersnatch", - "license": "Apache 2.0", - "source": "https://github.com/notnownikki/puppet-bandersnatch.git", - "project_page": "https://github.com/notnownikki/puppet-bandersnatch", - "issues_url": "https://github.com/notnownikki/puppet-bandersnatch/issues", - "dependencies": [] -} diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb deleted file mode 100644 index bb68740..0000000 --- a/spec/acceptance/basic_spec.rb +++ /dev/null @@ -1,48 +0,0 @@ -require 'puppet-openstack_infra_spec_helper/spec_helper_acceptance' - -describe 'puppet-bandersnatch module' do - def pp_path - base_path = File.dirname(__FILE__) - File.join(base_path, 'fixtures') - end - - def preconditions_puppet_module - module_path = File.join(pp_path, 'preconditions.pp') - File.read(module_path) - end - - def default_puppet_module - module_path = File.join(pp_path, 'default.pp') - File.read(module_path) - end - - before(:all) do - apply_manifest(preconditions_puppet_module, catch_failures: true) - end - - it 'should work with no errors' do - apply_manifest(default_puppet_module, catch_failures: true) - end - - it 'should be idempotent', :if => ['debian', 'ubuntu'].include?(os[:family]) do - apply_manifest(default_puppet_module, catch_changes: true) - end - - it 'should be idempotent', :if => ['fedora', 'redhat'].include?(os[:family]) do - pending('this module is not idempotent on CentOS yet') - apply_manifest(default_puppet_module, catch_changes: true) - end - - describe 'required services' do - # Wait for bandersnatch to run - describe command('sleep 480 && curl localhost') do - its(:stdout) { should contain('Index of /') } - its(:stdout) { should contain('simple/') } - end - - describe command('curl localhost/robots.txt') do - its(:stdout) { should match 'User-agent: *' } - its(:stdout) { should match 'Disallow: /' } - end - end -end diff --git a/spec/acceptance/fixtures/default.pp b/spec/acceptance/fixtures/default.pp deleted file mode 100644 index 2c5c57e..0000000 --- a/spec/acceptance/fixtures/default.pp +++ /dev/null @@ -1,22 +0,0 @@ -class { '::bandersnatch': -} - -class { '::bandersnatch::cron': -} - -class { '::bandersnatch::httpd': - vhost_name => '127.0.0.1', -} - -class { '::bandersnatch::mirror': - require => Class['::bandersnatch'], -} - -if $::osfamily == 'RedHat' { - exec { 'manage selinux': - command => 'semanage fcontext -a -t httpd_sys_content_t "/srv/static(/.*)?" && restorecon -R -v /srv', - unless => 'ls -lZ /srv | grep httpd_sys_content_t', - path => '/bin:/sbin', - require => Class['::bandersnatch::mirror'], - } -} diff --git a/spec/acceptance/fixtures/preconditions.pp b/spec/acceptance/fixtures/preconditions.pp deleted file mode 100644 index dc40960..0000000 --- a/spec/acceptance/fixtures/preconditions.pp +++ /dev/null @@ -1,20 +0,0 @@ -# Installing pip since bandersnatch dependencies are managed by it -exec { 'download get-pip.py': - command => 'wget https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py', - path => '/bin:/usr/bin:/usr/local/bin', - creates => '/tmp/get-pip.py', -} - -exec { 'install pip using get-pip': - command => 'python /tmp/get-pip.py', - path => '/bin:/usr/bin:/usr/local/bin', - refreshonly => true, - subscribe => Exec['download get-pip.py'], -} - -# Install selinux utils so that we can manage apache directory permissions for CentOS -if $::osfamily == 'RedHat' { - package { 'policycoreutils-python': - ensure => present, - } -} diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml deleted file mode 100644 index 3bb3e62..0000000 --- a/spec/acceptance/nodesets/default.yml +++ /dev/null @@ -1,11 +0,0 @@ -HOSTS: - ubuntu-server-1404-x64: - roles: - - master - platform: ubuntu-14.04-amd64 - box: puppetlabs/ubuntu-14.04-64-nocm - box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm - hypervisor: vagrant -CONFIG: - log_level: debug - type: git diff --git a/spec/acceptance/nodesets/nodepool-centos7.yml b/spec/acceptance/nodesets/nodepool-centos7.yml deleted file mode 100644 index c552874..0000000 --- a/spec/acceptance/nodesets/nodepool-centos7.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-70-x64: - roles: - - master - platform: el-7-x86_64 - hypervisor: none - ip: 127.0.0.1 -CONFIG: - type: foss - set_env: false diff --git a/spec/acceptance/nodesets/nodepool-trusty.yml b/spec/acceptance/nodesets/nodepool-trusty.yml deleted file mode 100644 index 9fc624e..0000000 --- a/spec/acceptance/nodesets/nodepool-trusty.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-14.04-amd64: - roles: - - master - platform: ubuntu-14.04-amd64 - hypervisor: none - ip: 127.0.0.1 -CONFIG: - type: foss - set_env: false diff --git a/spec/acceptance/nodesets/nodepool-xenial.yml b/spec/acceptance/nodesets/nodepool-xenial.yml deleted file mode 100644 index 99dd318..0000000 --- a/spec/acceptance/nodesets/nodepool-xenial.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-16.04-amd64: - roles: - - master - platform: ubuntu-16.04-amd64 - hypervisor: none - ip: 127.0.0.1 -CONFIG: - type: foss - set_env: false diff --git a/templates/bandersnatch.conf.erb b/templates/bandersnatch.conf.erb deleted file mode 100644 index 455c42a..0000000 --- a/templates/bandersnatch.conf.erb +++ /dev/null @@ -1,52 +0,0 @@ -[mirror] -; The directory where the mirror data will be stored. -directory = <%= @mirror_root -%> - -; The PyPI server which will be mirrored. -; master = https://testpypi.python.org -; scheme for PyPI server MUST be https -master = https://pypi.python.org - -; The network socket timeout to use for all connections. This is set to a -; somewhat aggressively low value: rather fail quickly temporarily and re-run -; the client soon instead of having a process hang infinitely and have TCP not -; catching up for ages. -timeout = 10 - -; Number of worker threads to use for parallel downloads. -; Recommendations for worker thread setting: -; - leave the default of 3 to avoid overloading the pypi master -; - official servers located in data centers could run 20 workers -; - anything beyond 50 is probably unreasonable and avoided by bandersnatch -workers = 3 - -<% if @hash_index == true -%> -hash-index = true -<% end -%> - -; Whether to stop a sync quickly after an error is found or whether to continue -; syncing but not marking the sync as successful. Value should be "true" or -; "false". -stop-on-error = false - -; Whether or not files that have been deleted on the master should be deleted -; on the mirror, too. -; IMPORTANT: if you are running an official mirror than you *need* to leave -; this on. -delete-packages = true - -[statistics] -; A glob pattern matching all access log files that should be processed to -; generate daily access statistics that will be aggregated on the master PyPI. -access-log-pattern = /var/log/apache2/pypi.*openstack.org_access.* - -<% if not @package_blacklist.empty? -%> -; blacklist -; List of PyPI packages not to sync - Useful if malicious packages are mirrored -[blacklist] -packages = -<% @package_blacklist.each do |package| -%> - <%= package %> -<% end -%> -<% end -%> -; vim: set ft=cfg: