From: David Schmitt Date: Wed, 13 Apr 2016 19:49:43 +0000 (+0100) Subject: Update to newest modulesync_configs [9ca280f] X-Git-Tag: 1.8.2~38^2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7e5274d68ea972f559d333b1468bb0cb36175d77;p=puppet-modules%2Fpuppetlabs-firewall.git Update to newest modulesync_configs [9ca280f] --- diff --git a/.sync.yml b/.sync.yml new file mode 100644 index 0000000..ffc7ff3 --- /dev/null +++ b/.sync.yml @@ -0,0 +1,10 @@ +--- +# only run a minimal subset of tests on travis, as many of the tests exercise the kernel, which is the "wrong" one anyways +.travis.yml: + docker_sets: + - set: docker/ubuntu-14.04 + options: + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=@@SET@@ SPEC_OPTS="--tag docker" + - set: docker/centos-7 + options: + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=@@SET@@ SPEC_OPTS=""--tag docker" diff --git a/.travis.yml b/.travis.yml index 588fb5b..d0ebda3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,18 +3,33 @@ sudo: false language: ruby cache: bundler -bundler_args: --without system_tests script: "bundle exec rake validate lint spec" matrix: fast_finish: true include: - rvm: 2.1.6 + dist: trusty + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04 SPEC_OPTS="--tag docker" + script: bundle exec rake beaker + services: docker + sudo: required + - rvm: 2.1.6 + dist: trusty + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7 SPEC_OPTS=""--tag docker" + script: bundle exec rake beaker + services: docker + sudo: required + - rvm: 2.1.6 + bundler_args: --without system_tests env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes" - rvm: 2.1.5 + bundler_args: --without system_tests env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" - rvm: 2.1.5 + bundler_args: --without system_tests env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 1.9.3 + bundler_args: --without system_tests env: PUPPET_GEM_VERSION="~> 3.0" notifications: email: false diff --git a/Gemfile b/Gemfile index 1ab76f0..e490bc9 100644 --- a/Gemfile +++ b/Gemfile @@ -18,12 +18,7 @@ group :development, :unit_tests do gem 'puppet_facts', :require => false gem 'puppet-blacksmith', :require => false gem 'puppetlabs_spec_helper', :require => false - - # Modulesync will override the following. This is only a temporary measure until we fix - # our tests for rspec-puppet 2.4.0 support. - # Actual update work to be done in https://tickets.puppetlabs.com/browse/FM-5035 - gem 'rspec-puppet', '= 2.3.2', :require => false - + gem 'rspec-puppet', '>= 2.3.2', :require => false gem 'simplecov', :require => false end group :system_tests do diff --git a/spec/acceptance/firewall_spec.rb b/spec/acceptance/firewall_spec.rb index 9f39c7e..0b720e3 100644 --- a/spec/acceptance/firewall_spec.rb +++ b/spec/acceptance/firewall_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper_acceptance' -describe 'firewall basics' do +describe 'firewall basics', docker: true do before :all do iptables_flush_all_tables ip6tables_flush_all_tables diff --git a/spec/acceptance/nodesets/centos-59-x64-pe.yml b/spec/acceptance/nodesets/centos-59-x64-pe.yml deleted file mode 100644 index 3a6470b..0000000 --- a/spec/acceptance/nodesets/centos-59-x64-pe.yml +++ /dev/null @@ -1,12 +0,0 @@ -HOSTS: - centos-59-x64: - roles: - - master - - database - - console - platform: el-5-x86_64 - box : centos-59-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: pe diff --git a/spec/acceptance/nodesets/centos-59-x64.yml b/spec/acceptance/nodesets/centos-59-x64.yml deleted file mode 100644 index 2ad90b8..0000000 --- a/spec/acceptance/nodesets/centos-59-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-59-x64: - roles: - - master - platform: el-5-x86_64 - box : centos-59-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: git diff --git a/spec/acceptance/nodesets/centos-64-x64-fusion.yml b/spec/acceptance/nodesets/centos-64-x64-fusion.yml deleted file mode 100644 index d516673..0000000 --- a/spec/acceptance/nodesets/centos-64-x64-fusion.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-64-x64: - roles: - - master - platform: el-6-x86_64 - box : centos-64-x64-fusion503-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-fusion503-nocm.box - hypervisor : fusion -CONFIG: - type: foss diff --git a/spec/acceptance/nodesets/centos-64-x64-pe.yml b/spec/acceptance/nodesets/centos-64-x64-pe.yml deleted file mode 100644 index 7d9242f..0000000 --- a/spec/acceptance/nodesets/centos-64-x64-pe.yml +++ /dev/null @@ -1,12 +0,0 @@ -HOSTS: - centos-64-x64: - roles: - - master - - database - - dashboard - platform: el-6-x86_64 - box : centos-64-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: pe diff --git a/spec/acceptance/nodesets/centos-64-x64.yml b/spec/acceptance/nodesets/centos-64-x64.yml deleted file mode 100644 index 05540ed..0000000 --- a/spec/acceptance/nodesets/centos-64-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-64-x64: - roles: - - master - platform: el-6-x86_64 - box : centos-64-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: foss diff --git a/spec/acceptance/nodesets/centos-65-x64.yml b/spec/acceptance/nodesets/centos-65-x64.yml deleted file mode 100644 index 4e2cb80..0000000 --- a/spec/acceptance/nodesets/centos-65-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-65-x64: - roles: - - master - platform: el-6-x86_64 - box : centos-65-x64-vbox436-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box - hypervisor : vagrant -CONFIG: - type: foss diff --git a/spec/acceptance/nodesets/centos-7-x64.yml b/spec/acceptance/nodesets/centos-7-x64.yml index f20fe44..1a40c89 100644 --- a/spec/acceptance/nodesets/centos-7-x64.yml +++ b/spec/acceptance/nodesets/centos-7-x64.yml @@ -1,11 +1,10 @@ HOSTS: centos-7-x64: roles: - - master - platform: el-7-x86_64 - box : puppetlabs/centos-7.0-64-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-7.0-64-virtualbox-nocm.box - hypervisor : vagrant + - agent + - default + platform: redhat-7-x86_64 + hypervisor: vagrant + box: puppetlabs/centos-7.2-64-nocm CONFIG: type: foss - log_level: verbose \ No newline at end of file diff --git a/spec/acceptance/nodesets/debian-607-x64.yml b/spec/acceptance/nodesets/debian-607-x64.yml deleted file mode 100644 index 4c8be42..0000000 --- a/spec/acceptance/nodesets/debian-607-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - debian-607-x64: - roles: - - master - platform: debian-6-amd64 - box : debian-607-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: git diff --git a/spec/acceptance/nodesets/debian-70rc1-x64.yml b/spec/acceptance/nodesets/debian-70rc1-x64.yml deleted file mode 100644 index 19181c1..0000000 --- a/spec/acceptance/nodesets/debian-70rc1-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - debian-70rc1-x64: - roles: - - master - platform: debian-7-amd64 - box : debian-70rc1-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: git diff --git a/spec/acceptance/nodesets/debian-8-x64.yml b/spec/acceptance/nodesets/debian-8-x64.yml new file mode 100644 index 0000000..fef6e63 --- /dev/null +++ b/spec/acceptance/nodesets/debian-8-x64.yml @@ -0,0 +1,10 @@ +HOSTS: + debian-8-x64: + roles: + - agent + - default + platform: debian-8-amd64 + hypervisor: vagrant + box: puppetlabs/debian-8.2-64-nocm +CONFIG: + type: foss diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml index 05540ed..dba339c 100644 --- a/spec/acceptance/nodesets/default.yml +++ b/spec/acceptance/nodesets/default.yml @@ -1,10 +1,10 @@ HOSTS: - centos-64-x64: + ubuntu-1404-x64: roles: - - master - platform: el-6-x86_64 - box : centos-64-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box - hypervisor : vagrant + - agent + - default + platform: ubuntu-14.04-amd64 + hypervisor: vagrant + box: puppetlabs/ubuntu-14.04-64-nocm CONFIG: type: foss diff --git a/spec/acceptance/nodesets/docker/centos-7.yml b/spec/acceptance/nodesets/docker/centos-7.yml new file mode 100644 index 0000000..a3333aa --- /dev/null +++ b/spec/acceptance/nodesets/docker/centos-7.yml @@ -0,0 +1,12 @@ +HOSTS: + centos-7-x64: + platform: el-7-x86_64 + hypervisor: docker + image: centos:7 + docker_preserve_image: true + docker_cmd: '["/usr/sbin/init"]' + # install various tools required to get the image up to usable levels + docker_image_commands: + - 'yum install -y crontabs tar wget openssl sysvinit-tools iproute which initscripts' +CONFIG: + trace_limit: 200 diff --git a/spec/acceptance/nodesets/docker/debian-8.yml b/spec/acceptance/nodesets/docker/debian-8.yml new file mode 100644 index 0000000..df5c319 --- /dev/null +++ b/spec/acceptance/nodesets/docker/debian-8.yml @@ -0,0 +1,11 @@ +HOSTS: + debian-8-x64: + platform: debian-8-amd64 + hypervisor: docker + image: debian:8 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get update && apt-get install -y net-tools wget locales strace lsof && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen' +CONFIG: + trace_limit: 200 diff --git a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/spec/acceptance/nodesets/docker/ubuntu-14.04.yml new file mode 100644 index 0000000..b1efa58 --- /dev/null +++ b/spec/acceptance/nodesets/docker/ubuntu-14.04.yml @@ -0,0 +1,12 @@ +HOSTS: + ubuntu-1404-x64: + platform: ubuntu-14.04-amd64 + hypervisor: docker + image: ubuntu:14.04 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + # ensure that upstart is booting correctly in the container + - 'rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl && apt-get update && apt-get install -y net-tools wget && locale-gen en_US.UTF-8' +CONFIG: + trace_limit: 200 diff --git a/spec/acceptance/nodesets/fedora-18-x64.yml b/spec/acceptance/nodesets/fedora-18-x64.yml deleted file mode 100644 index 624b537..0000000 --- a/spec/acceptance/nodesets/fedora-18-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - fedora-18-x64: - roles: - - master - platform: fedora-18-x86_64 - box : fedora-18-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: git diff --git a/spec/acceptance/nodesets/new/aio/debian-8-64mda.yml b/spec/acceptance/nodesets/new/aio/debian-8-64mda.yml deleted file mode 100644 index 90a8e83..0000000 --- a/spec/acceptance/nodesets/new/aio/debian-8-64mda.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -HOSTS: - debian-8-amd64-agent: - roles: - - agent - - default - platform: debian-8-amd64 - template: debian-8-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - type: aio - ssh: - timeout: 600 - diff --git a/spec/acceptance/nodesets/new/aio/redhat-6-64mda.yml b/spec/acceptance/nodesets/new/aio/redhat-6-64mda.yml deleted file mode 100644 index 9e63eeb..0000000 --- a/spec/acceptance/nodesets/new/aio/redhat-6-64mda.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -HOSTS: - redhat-6-x86_64-agent: - roles: - - agent - - default - platform: el-6-x86_64 - template: redhat-6-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - type: aio - ssh: - timeout: 600 \ No newline at end of file diff --git a/spec/acceptance/nodesets/new/aio/redhat-7-64mda.yml b/spec/acceptance/nodesets/new/aio/redhat-7-64mda.yml deleted file mode 100644 index b9c352b..0000000 --- a/spec/acceptance/nodesets/new/aio/redhat-7-64mda.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -HOSTS: - redhat-7-x86_64-agent: - roles: - - agent - - default - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - type: aio - ssh: - timeout: 600 \ No newline at end of file diff --git a/spec/acceptance/nodesets/new/aio/ubuntu-1404-64mda.yml b/spec/acceptance/nodesets/new/aio/ubuntu-1404-64mda.yml deleted file mode 100644 index 9029d26..0000000 --- a/spec/acceptance/nodesets/new/aio/ubuntu-1404-64mda.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -HOSTS: - ubuntu-1404-agent: - roles: - - agent - - default - platform: ubuntu-14.04-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1404-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - type: aio - ssh: - timeout: 600 \ No newline at end of file diff --git a/spec/acceptance/nodesets/new/pe/centos-5-64mda.yml b/spec/acceptance/nodesets/new/pe/centos-5-64mda.yml deleted file mode 100644 index ba6c23c..0000000 --- a/spec/acceptance/nodesets/new/pe/centos-5-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - centos-5-x86_64-agent: - roles: - - agent - - default - platform: el-5-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/centos-5-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 diff --git a/spec/acceptance/nodesets/new/pe/centos-6-64mda.yml b/spec/acceptance/nodesets/new/pe/centos-6-64mda.yml deleted file mode 100644 index e97e73f..0000000 --- a/spec/acceptance/nodesets/new/pe/centos-6-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - centos-6-x86_64-agent: - roles: - - agent - - default - platform: el-6-x86_64 - template: Delivery/Quality Assurance/Templates/vCloud/centos-6-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 diff --git a/spec/acceptance/nodesets/new/pe/centos-7-64mda.yml b/spec/acceptance/nodesets/new/pe/centos-7-64mda.yml deleted file mode 100644 index 056b52d..0000000 --- a/spec/acceptance/nodesets/new/pe/centos-7-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - centos-7-x86_64-agent: - roles: - - agent - - default - platform: el-7-x86_64 - template: centos-7-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 diff --git a/spec/acceptance/nodesets/new/pe/debian-6-64mda.yml b/spec/acceptance/nodesets/new/pe/debian-6-64mda.yml deleted file mode 100644 index 3101a5a..0000000 --- a/spec/acceptance/nodesets/new/pe/debian-6-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - debian-6-amd64-agent: - roles: - - agent - - default - platform: debian-6-amd64 - template: debian-6-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 diff --git a/spec/acceptance/nodesets/new/pe/debian-7-64mda.yml b/spec/acceptance/nodesets/new/pe/debian-7-64mda.yml deleted file mode 100644 index 4ebf914..0000000 --- a/spec/acceptance/nodesets/new/pe/debian-7-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - debian-7-amd64-agent: - roles: - - agent - - default - platform: debian-7-amd64 - template: debian-7-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 \ No newline at end of file diff --git a/spec/acceptance/nodesets/new/pe/debian-8-64mda.yml b/spec/acceptance/nodesets/new/pe/debian-8-64mda.yml deleted file mode 100644 index dc46f03..0000000 --- a/spec/acceptance/nodesets/new/pe/debian-8-64mda.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -HOSTS: - debian-8-amd64-agent: - roles: - - agent - - default - platform: debian-8-amd64 - template: debian-8-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 - diff --git a/spec/acceptance/nodesets/new/pe/oracle-6-64mda.yml b/spec/acceptance/nodesets/new/pe/oracle-6-64mda.yml deleted file mode 100644 index 58e0fc0..0000000 --- a/spec/acceptance/nodesets/new/pe/oracle-6-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - oracle-6-x86_64-agent: - roles: - - agent - - default - platform: el-6-x86_64 - template: oracle-6-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 \ No newline at end of file diff --git a/spec/acceptance/nodesets/new/pe/oracle-7-64mda.yml b/spec/acceptance/nodesets/new/pe/oracle-7-64mda.yml deleted file mode 100644 index 157d814..0000000 --- a/spec/acceptance/nodesets/new/pe/oracle-7-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - oracle-7-x86_64-agent: - roles: - - agent - - default - platform: el-7-x86_64 - template: oracle-7-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 \ No newline at end of file diff --git a/spec/acceptance/nodesets/new/pe/redhat-5-64mda.yml b/spec/acceptance/nodesets/new/pe/redhat-5-64mda.yml deleted file mode 100644 index 56e45f5..0000000 --- a/spec/acceptance/nodesets/new/pe/redhat-5-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - redhat-5-x86_64-agent: - roles: - - agent - - default - platform: el-5-x86_64 - template: redhat-5-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 \ No newline at end of file diff --git a/spec/acceptance/nodesets/new/pe/redhat-6-64mda.yml b/spec/acceptance/nodesets/new/pe/redhat-6-64mda.yml deleted file mode 100644 index a41c585..0000000 --- a/spec/acceptance/nodesets/new/pe/redhat-6-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - redhat-6-x86_64-agent: - roles: - - agent - - default - platform: el-6-x86_64 - template: redhat-6-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 \ No newline at end of file diff --git a/spec/acceptance/nodesets/new/pe/redhat-7-64mda.yml b/spec/acceptance/nodesets/new/pe/redhat-7-64mda.yml deleted file mode 100644 index 6ed476b..0000000 --- a/spec/acceptance/nodesets/new/pe/redhat-7-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - redhat-7-x86_64-agent: - roles: - - agent - - default - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 \ No newline at end of file diff --git a/spec/acceptance/nodesets/new/pe/scientific-5-64mda.yml b/spec/acceptance/nodesets/new/pe/scientific-5-64mda.yml deleted file mode 100644 index 4ae3e43..0000000 --- a/spec/acceptance/nodesets/new/pe/scientific-5-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - scientific-5-x86_64-agent: - roles: - - agent - - default - platform: el-5-x86_64 - template: scientific-5-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 \ No newline at end of file diff --git a/spec/acceptance/nodesets/new/pe/scientific-6-64mda.yml b/spec/acceptance/nodesets/new/pe/scientific-6-64mda.yml deleted file mode 100644 index 0c9457f..0000000 --- a/spec/acceptance/nodesets/new/pe/scientific-6-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - scientific-6-x86_64-agent: - roles: - - agent - - default - platform: el-6-x86_64 - template: scientific-6-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 \ No newline at end of file diff --git a/spec/acceptance/nodesets/new/pe/scientific-7-64mda.yml b/spec/acceptance/nodesets/new/pe/scientific-7-64mda.yml deleted file mode 100644 index 80692bf..0000000 --- a/spec/acceptance/nodesets/new/pe/scientific-7-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - scientific-7-x86_64-agent: - roles: - - agent - - default - platform: el-7-x86_64 - template: scientific-7-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 \ No newline at end of file diff --git a/spec/acceptance/nodesets/new/pe/sles-10-64mda.yml b/spec/acceptance/nodesets/new/pe/sles-10-64mda.yml deleted file mode 100644 index 5761d8d..0000000 --- a/spec/acceptance/nodesets/new/pe/sles-10-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - sles-10-x86_64-agent: - roles: - - agent - - default - platform: sles-10-x86_64 - template: sles-10-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 \ No newline at end of file diff --git a/spec/acceptance/nodesets/new/pe/sles-11-64mda.yml b/spec/acceptance/nodesets/new/pe/sles-11-64mda.yml deleted file mode 100644 index 660c72f..0000000 --- a/spec/acceptance/nodesets/new/pe/sles-11-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - sles-11-x86_64-agent: - roles: - - agent - - default - platform: sles-11-x86_64 - template: sles-11-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 \ No newline at end of file diff --git a/spec/acceptance/nodesets/new/pe/sles-12-64mda.yml b/spec/acceptance/nodesets/new/pe/sles-12-64mda.yml deleted file mode 100644 index 0e7884c..0000000 --- a/spec/acceptance/nodesets/new/pe/sles-12-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - sles-12-x86_64-agent: - roles: - - agent - - default - platform: sles-12-x86_64 - template: sles-12-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 \ No newline at end of file diff --git a/spec/acceptance/nodesets/new/pe/ubuntu-1004-64mda.yml b/spec/acceptance/nodesets/new/pe/ubuntu-1004-64mda.yml deleted file mode 100644 index 0baeba8..0000000 --- a/spec/acceptance/nodesets/new/pe/ubuntu-1004-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - ubuntu-1004-agent: - roles: - - agent - - default - platform: ubuntu-10.04-amd64 - template: ubuntu-1004-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 \ No newline at end of file diff --git a/spec/acceptance/nodesets/new/pe/ubuntu-1204-64mda.yml b/spec/acceptance/nodesets/new/pe/ubuntu-1204-64mda.yml deleted file mode 100644 index d8c2931..0000000 --- a/spec/acceptance/nodesets/new/pe/ubuntu-1204-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - ubuntu-1204-agent: - roles: - - agent - - default - platform: ubuntu-12.04-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 \ No newline at end of file diff --git a/spec/acceptance/nodesets/new/pe/ubuntu-1404-64mda.yml b/spec/acceptance/nodesets/new/pe/ubuntu-1404-64mda.yml deleted file mode 100644 index c53683d..0000000 --- a/spec/acceptance/nodesets/new/pe/ubuntu-1404-64mda.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -HOSTS: - ubuntu-1404-agent: - roles: - - agent - - default - platform: ubuntu-14.04-amd64 - template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1404-x86_64 - hypervisor: vcloud - redhat-7-x86_64-master: - roles: - - master - - dashboard - - database - - agent - platform: el-7-x86_64 - template: redhat-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic - pooling_api: http://vcloud.delivery.puppetlabs.net/ - ssh: - timeout: 600 \ No newline at end of file diff --git a/spec/acceptance/nodesets/sles-11sp1-x64.yml b/spec/acceptance/nodesets/sles-11sp1-x64.yml deleted file mode 100644 index 554c37a..0000000 --- a/spec/acceptance/nodesets/sles-11sp1-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - sles-11sp1-x64: - roles: - - master - platform: sles-11-x86_64 - box : sles-11sp1-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: git diff --git a/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml deleted file mode 100644 index 5ca1514..0000000 --- a/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-server-10044-x64: - roles: - - master - platform: ubuntu-10.04-amd64 - box : ubuntu-server-10044-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: foss diff --git a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml deleted file mode 100644 index d065b30..0000000 --- a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-server-12042-x64: - roles: - - master - platform: ubuntu-12.04-amd64 - box : ubuntu-server-12042-x64-vbox4210-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box - hypervisor : vagrant -CONFIG: - type: foss 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 cba1cd0..0000000 --- a/spec/acceptance/nodesets/ubuntu-server-1404-x64.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/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index a200bc8..78c09e9 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -33,6 +33,9 @@ RSpec.configure do |c| hosts.each do |host| copy_module_to(host, :source => proj_root, :module_name => 'firewall') on host, puppet('module install puppetlabs-stdlib --version 3.2.0') + + # the ubuntu-14.04 docker image doesn't carry the iptables command + apply_manifest_on host, 'package { "iptables": ensure => installed }' if fact('osfamily') == 'Debian' end end end