From aee23f17d6270c2de215a0afc06862b550b6a0e2 Mon Sep 17 00:00:00 2001 From: Umesh Singla Date: Tue, 20 Dec 2016 06:12:45 +0530 Subject: [PATCH] Add coala support and fix/lint files Additional dependencies - puppet-lint, xmllint, rubocop Only very obvious changes have been made, ignoring class-name, line-length, string-literal related warnings Change-Id: I8f268c14d0f23ad0290375b27da5586e57107a31 Signed-off-by: Umesh Singla Signed-off-by: Daniel Farrell --- .coafile | 30 +++++ .fixtures.yml | 1 + .travis.yml | 26 ++-- .yamllint | 45 +++++++ CONTRIBUTING.markdown | 74 +++++++---- README.markdown | 101 +++++++------- Vagrantfile | 1 - files/jolokia.xml | 4 +- manifests/config.pp | 3 +- manifests/init.pp | 18 ++- metadata.json | 124 +++++++++--------- spec/acceptance/nodesets/centos-7-docker.yml | 1 + spec/acceptance/nodesets/centos-7.yml | 1 + spec/acceptance/nodesets/default.yml | 1 + spec/acceptance/nodesets/fedora-22.yml | 1 + spec/acceptance/nodesets/fedora-23-docker.yml | 1 + spec/acceptance/nodesets/fedora-23.yml | 1 + .../nodesets/ubuntu-1404-docker.yml | 1 + spec/acceptance/nodesets/ubuntu-1404.yml | 1 + 19 files changed, 279 insertions(+), 156 deletions(-) create mode 100644 .coafile create mode 100644 .yamllint diff --git a/.coafile b/.coafile new file mode 100644 index 0000000..14c21a5 --- /dev/null +++ b/.coafile @@ -0,0 +1,30 @@ +[Default] +ignore = .gitignore +use_spaces = True + +[markdown] +bears = MarkdownBear +files = ./**/*.markdown, ./**/*.md +default_actions = MarkdownBear: ApplyPatchAction + +[json] +bears = JSONFormatBear +files = ./**/*.json +default_actions = JSONFormatBear: ApplyPatchAction + +[ruby] +bears = RuboCopBear +files = ./**/*.rb + +[puppet] +bears = PuppetLintBear +files = ./**/*.pp + +[xml] +bears = XMLBear +files = ./**/*.xml + +[yaml] +bears = YAMLLintBear +yamllint_config = .yamllint +files = ./**/*.yaml, ./**/*.yml diff --git a/.fixtures.yml b/.fixtures.yml index 9822087..7023bd1 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,3 +1,4 @@ +--- fixtures: repositories: stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git" diff --git a/.travis.yml b/.travis.yml index 78f0399..b0e8d55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,17 +18,17 @@ env: - PUPPET_VERSION="~> 4.3.0" matrix: exclude: - - rvm: 2.2.3 - env: PUPPET_VERSION="~> 3.4.0" - - rvm: 2.2.3 - env: PUPPET_VERSION="~> 3.5.0" - - rvm: 2.2.3 - env: PUPPET_VERSION="~> 3.6.0" - - rvm: 2.2.3 - env: PUPPET_VERSION="~> 3.7.0" + - rvm: 2.2.3 + env: PUPPET_VERSION="~> 3.4.0" + - rvm: 2.2.3 + env: PUPPET_VERSION="~> 3.5.0" + - rvm: 2.2.3 + env: PUPPET_VERSION="~> 3.6.0" + - rvm: 2.2.3 + env: PUPPET_VERSION="~> 3.7.0" notifications: - email: - recipients: - - dfarrell@redhat.com - on_success: change - on_failure: change + email: + recipients: + - dfarrell@redhat.com + on_success: change + on_failure: change diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000..18a3730 --- /dev/null +++ b/.yamllint @@ -0,0 +1,45 @@ +--- +rules: + braces: + min-spaces-inside: 0 + max-spaces-inside: 0 + brackets: + min-spaces-inside: 0 + max-spaces-inside: 0 + colons: + max-spaces-before: 0 + max-spaces-after: 1 + commas: + max-spaces-before: 0 + min-spaces-after: 1 + max-spaces-after: 1 + comments: + level: warning + require-starting-space: true + min-spaces-from-content: 2 + comments-indentation: + level: warning + document-end: disable + document-start: + level: warning + present: true + empty-lines: + max: 2 + max-start: 0 + max-end: 0 + hyphens: + max-spaces-after: 1 + indentation: + spaces: consistent + indent-sequences: true + check-multi-line-strings: false + key-duplicates: enable + line-length: + max: 80 + allow-non-breakable-words: true + allow-non-breakable-inline-mappings: true + new-line-at-end-of-file: enable + new-lines: + type: unix + trailing-spaces: enable + truthy: disable diff --git a/CONTRIBUTING.markdown b/CONTRIBUTING.markdown index f152692..e5640b9 100644 --- a/CONTRIBUTING.markdown +++ b/CONTRIBUTING.markdown @@ -4,17 +4,18 @@ We work to make contributing easy. Please let us know if you spot something we can do better. #### Table of Contents + 1. [Overview](#overview) -1. [Communication](#communication) - * [Issues](#issues) - * [IRC channel](#irc-channel) -1. [Patches](#patches) -1. [Testing](#testing) - * [Test Dependencies](#test-dependencies) - * [Syntax and Style Tests](#syntax-and-style-tests) - * [Unit Tests](#unit-tests) - * [System Tests](#system-tests) - * [Tests in Continuous Integration](#tests-in-continuous-integration) +2. [Communication](#communication) + - [Issues](#issues) + - [IRC channel](#irc-channel) +3. [Patches](#patches) +4. [Testing](#testing) + - [Test Dependencies](#test-dependencies) + - [Syntax and Style Tests](#syntax-and-style-tests) + - [Unit Tests](#unit-tests) + - [System Tests](#system-tests) + - [Tests in Continuous Integration](#tests-in-continuous-integration) ## Overview @@ -71,24 +72,26 @@ Feel free to join us at **#opendaylight-integration** on `chat.freenode.net`. Yo Please use [Pull Requests][2] to submit patches. Basics of a pull request: -* Use the GitHub web UI to fork our repo. -* Clone your fork to your local system. -* Make your changes. -* Commit your changes, using a [good commit message][7] and referencing any -applicable issues. -* Push your commit. -* Submit a pull request against the project, again using GitHub's web UI. -* We'll give feedback and get your changed merged ASAP. -* You contributed! [Thank you][8]! + +- Use the GitHub web UI to fork our repo. +- Clone your fork to your local system. +- Make your changes. +- Commit your changes, using a [good commit message][7] and referencing any + applicable issues. +- Push your commit. +- Submit a pull request against the project, again using GitHub's web UI. +- We'll give feedback and get your changed merged ASAP. +- You contributed! [Thank you][8]! Other tips for submitting excellent pull requests: -* If you'd like to make more than one logically distinct change, please submit -them as different pull requests (if they don't depend on each other) or -different commits in the same PR (if they do). -* If your PR contains a number of commits that provide one logical change, -please squash them using `git rebase`. -* Please provide test coverage for your changes. -* If applicable, please provide documentation updates to reflect your changes. + +- If you'd like to make more than one logically distinct change, please submit + them as different pull requests (if they don't depend on each other) or + different commits in the same PR (if they do). +- If your PR contains a number of commits that provide one logical change, + please squash them using `git rebase`. +- Please provide test coverage for your changes. +- If applicable, please provide documentation updates to reflect your changes. ## Testing @@ -212,23 +215,40 @@ We use [Travis CI][16] to run our unit, syntax and style tests against a matrix of supported Ruby and Puppet versions at every commit. This currently results in >8500 automated tests per commit. - [1]: https://github.com/dfarrell07/puppet-opendaylight/issues + [2]: https://github.com/dfarrell07/puppet-opendaylight/pulls + [3]: https://github.com/dfarrell07/puppet-opendaylight/labels/good-for-beginners + [4]: https://github.com/dfarrell07/puppet-opendaylight/labels/prio%3Ahigh + [5]: https://github.com/dfarrell07/puppet-opendaylight/labels/prio%3Anormal + [6]: https://help.github.com/articles/closing-issues-via-commit-messages/ + [7]: http://chris.beams.io/posts/git-commit/ + [8]: http://cdn3.volusion.com/74gtv.tjme9/v/vspfiles/photos/Delicious%20Dozen-1.jpg + [9]: http://bundler.io/ + [10]: http://puppet-lint.com/ + [11]: https://github.com/gds-operations/puppet-syntax + [12]: https://github.com/puppet-community/metadata-json-lint + [13]: https://github.com/puppetlabs/beaker + [14]: http://serverspec.org/resource_types.html + [15]: https://github.com/puppetlabs/beaker/wiki/How-to-Write-a-Beaker-Test-for-a-Module#typical-workflow + [16]: https://travis-ci.org/dfarrell07/puppet-opendaylight + [17]: https://www.vagrantup.com/downloads.html + [18]: www.virtualbox.org/wiki/Linux_Downloads + [19]: http://webchat.freenode.net/?channels=opendaylight-integration diff --git a/README.markdown b/README.markdown index 32e1b65..5c2931d 100644 --- a/README.markdown +++ b/README.markdown @@ -3,24 +3,25 @@ # OpenDaylight -#### Table of Contents +#### Table of Contents + 1. [Overview](#overview) -1. [Module Description](#module-description) -1. [Setup](#setup) - * [What `opendaylight` affects](#what-opendaylight-affects) - * [Beginning with `opendaylight`](#beginning-with-opendaylight) -1. [Usage](#usage) - * [Karaf Features](#karaf-features) - * [Install Method](#install-method) - * [RPM Repo](#rpm-repo) - * [Ports](#ports) - * [Log Verbosity](#log-verbosity) - * [Enabling ODL OVSDB L3](#enabling-odl-ovsdb-l3) - * [Enabling ODL OVSDB HA](#enabling-odl-ovsdb-ha) -1. [Reference ](#reference) -1. [Limitations](#limitations) -1. [Development](#development) -1. [Release Notes/Contributors](#release-notescontributors) +2. [Module Description](#module-description) +3. [Setup](#setup) + - [What `opendaylight` affects](#what-opendaylight-affects) + - [Beginning with `opendaylight`](#beginning-with-opendaylight) +4. [Usage](#usage) + - [Karaf Features](#karaf-features) + - [Install Method](#install-method) + - [RPM Repo](#rpm-repo) + - [Ports](#ports) + - [Log Verbosity](#log-verbosity) + - [Enabling ODL OVSDB L3](#enabling-odl-ovsdb-l3) + - [Enabling ODL OVSDB HA](#enabling-odl-ovsdb-ha) +5. [Reference ](#reference) +6. [Limitations](#limitations) +7. [Development](#development) +8. [Release Notes/Contributors](#release-notescontributors) ## Overview @@ -44,14 +45,14 @@ releases and service releases, like Beryllium or Beryllium SR3. ### What `opendaylight` affects -* Installs Java, which is required by ODL. -* Creates `odl:odl` user:group if they don't already exist. -* Installs [OpenDaylight][7]. -* Installs a [systemd unitfile][9] or [Upstart config file][10] for -OpenDaylight. -* Manipulates OpenDaylight's configuration files according to the params -passed to the `::opendaylight` class. -* Starts the `opendaylight` systemd or Upstart service. +- Installs Java, which is required by ODL. +- Creates `odl:odl` user:group if they don't already exist. +- Installs [OpenDaylight][7]. +- Installs a [systemd unitfile][9] or [Upstart config file][10] for + OpenDaylight. +- Manipulates OpenDaylight's configuration files according to the params + passed to the `::opendaylight` class. +- Starts the `opendaylight` systemd or Upstart service. ### Beginning with `opendaylight` @@ -185,7 +186,6 @@ This is only read when `install_method` is `rpm`. To change the port on which OpenDaylight's northbound listens for REST API calls, use the `odl_rest_port` param. - ```puppet class { 'opendaylight': odl_rest_port => '8080', @@ -237,16 +237,16 @@ class { 'opendaylight': #### Public classes -* `::opendaylight`: Main entry point to the module. All ODL knobs should be -managed through its params. +- `::opendaylight`: Main entry point to the module. All ODL knobs should be + managed through its params. #### Private classes -* `::opendaylight::params`: Contains default `opendaylight` class param values. -* `::opendaylight::install`: Installs ODL from an RPM or tarball. -* `::opendaylight::config`: Manages ODL config, including Karaf features and -REST port. -* `::opendaylight::service`: Starts the OpenDaylight service. +- `::opendaylight::params`: Contains default `opendaylight` class param values. +- `::opendaylight::install`: Installs ODL from an RPM or tarball. +- `::opendaylight::config`: Manages ODL config, including Karaf features and + REST port. +- `::opendaylight::service`: Starts the OpenDaylight service. ### `::opendaylight` @@ -272,7 +272,7 @@ Default: `[]` Valid options: A list of Karaf feature names as strings. -##### `install_method ` +##### `install_method` Specifies the install method by which to install OpenDaylight. @@ -283,7 +283,7 @@ Default: `'rpm'` Valid options: The strings `'tarball'` or `'rpm'`. -##### `odl_rest_port ` +##### `odl_rest_port` Specifies the port for the ODL northbound REST interface to listen on. @@ -371,7 +371,7 @@ The ODL OVSDB Clustering and Jolokia XML for HA are configured and enabled. Specifies the IPs that are part of the HA cluster enabled by `enable_ha`. -Default: [] +Default: \[] Valid options: An array of IP addresses `['10.10.10.1', '10.10.10.1', '10.10.10.3']`. @@ -387,7 +387,6 @@ Valid options: Index of a member of the array `ha_node_ips`: `0`. Required by: `enable_ha`, `ha_node_ips` - ##### `tarball_url` Specifies the ODL tarball to use when installing via the tarball install @@ -419,10 +418,10 @@ Valid options: `transparent`, `learn`, `statless` ## Limitations -* Tested on Fedora 22, 23, CentOS 7 and Ubuntu 14.04. -* CentOS 7 is currently the most stable OS option. -* The RPM install method is likely more reliable than the tarball install -method. +- Tested on Fedora 22, 23, CentOS 7 and Ubuntu 14.04. +- CentOS 7 is currently the most stable OS option. +- The RPM install method is likely more reliable than the tarball install + method. ## Development @@ -436,21 +435,35 @@ OpenDaylight Puppet module. See the [CHANGELOG][15] or our [git tags][16] for information about releases. See our [git commit history][17] for contributor information. - [1]: https://travis-ci.org/dfarrell07/puppet-opendaylight + [2]: https://gemnasium.com/dfarrell07/puppet-opendaylight + [4]: https://travis-ci.org/dfarrell07/puppet-opendaylight.svg + [5]: https://gemnasium.com/dfarrell07/puppet-opendaylight.svg + [7]: http://www.opendaylight.org/ + [8]: https://github.com/dfarrell07/puppet-opendaylight/blob/master/CONTRIBUTING.markdown#issues + [9]: https://github.com/dfarrell07/opendaylight-systemd/ + [10]: https://github.com/dfarrell07/puppet-opendaylight/blob/master/files/upstart.odl.conf + [11]: https://github.com/dfarrell07/vagrant-opendaylight/ + [12]: https://github.com/dfarrell07/vagrant-opendaylight/tree/master/manifests + [13]: https://github.com/dfarrell07/puppet-opendaylight/issues/63 + [14]: https://github.com/dfarrell07/puppet-opendaylight/blob/master/CONTRIBUTING.markdown + [15]: https://github.com/dfarrell07/puppet-opendaylight/blob/master/CHANGELOG + [16]: https://github.com/dfarrell07/puppet-opendaylight/releases + [17]: https://github.com/dfarrell07/puppet-opendaylight/commits/master -[18]: http://cbs.centos.org/repos/nfv7-opendaylight-40-release/x86_64/os/Packages/ OpenDaylight Beryllium CentOS CBS repo -[19]: https://wiki.opendaylight.org/view/Deployment#RPM OpenDaylight RPMs and their repos + +[18]: OpenDaylight Beryllium CentOS CBS repo +[19]: OpenDaylight RPMs and their repos diff --git a/Vagrantfile b/Vagrantfile index aaacf89..f0ccc60 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -2,7 +2,6 @@ # vi: set ft=ruby : Vagrant.configure(2) do |config| - # Re-map sync'd dir so it has the same name as the module # Not doing this causes `puppet apply` to fail at catalog compile config.vm.synced_folder ".", "/home/vagrant/puppet-opendaylight", type: "rsync" diff --git a/files/jolokia.xml b/files/jolokia.xml index e957099..42dc668 100644 --- a/files/jolokia.xml +++ b/files/jolokia.xml @@ -1,6 +1,6 @@ - - + + mvn:org.jolokia/jolokia-osgi/1.1.5 diff --git a/manifests/config.pp b/manifests/config.pp index b20b5c9..8208c29 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -97,7 +97,8 @@ class opendaylight::config { } $odl_datastore = [ - '/opt/opendaylight/etc/opendaylight', '/opt/opendaylight/etc/opendaylight/datastore', + '/opt/opendaylight/etc/opendaylight', + '/opt/opendaylight/etc/opendaylight/datastore', '/opt/opendaylight/etc/opendaylight/datastore/initial', '/opt/opendaylight/etc/opendaylight/datastore/initial/config', ] diff --git a/manifests/init.pp b/manifests/init.pp index 5b4a9fc..7aaa015 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -4,7 +4,8 @@ # # === Parameters # [*default_features*] -# Features that should normally be installed by default, but can be overridden. +# Features that should normally be installed by default, but can be +# overridden. # [*extra_features*] # List of features to install in addition to the default ones. # [*odl_rest_port *] @@ -12,19 +13,24 @@ # [*odl_bind_ip *] # IP for ODL northbound REST interface to bind to. # [*install_method *] -# How to install OpenDaylight. Current options are "rpm" and "tarball", default is RPM. +# How to install OpenDaylight. Current options are "rpm" and "tarball", +# default is RPM. # [*rpm_repo*] -# OpenDaylight CentOS CBS repo to install RPM from (opendaylight-4-testing, opendaylight-40-release, ...). +# OpenDaylight CentOS CBS repo to install RPM from (opendaylight-4-testing, +# opendaylight-40-release, ...). # [*tarball_url*] # If installing from a tarball, use this one. Defaults to latest ODL. # [*unitfile_url*] -# OpenDaylight .service file to use for tarball installs. Defaults to one used by ODL RPM. +# OpenDaylight .service file to use for tarball installs. Defaults to one +# used by ODL RPM. # [*enable_l3*] -# Enable or disable ODL OVSDB ML2 L3 forwarding. Valid: true, false, 'yes' and 'no'. +# Enable or disable ODL OVSDB ML2 L3 forwarding. Valid: true, false, 'yes' +# and 'no'. # [*log_levels*] # Custom OpenDaylight logger verbosity configuration (TRACE, DEBUG, INFO, WARN, ERROR). # [*enable_ha*] -# Enable or disable ODL OVSDB HA Clustering. Valid: true or false. Default: false. +# Enable or disable ODL OVSDB HA Clustering. Valid: true or false. +# Default: false. # [*ha_node_ips*] # Array of IPs for each node in the HA cluster. # [*ha_node_index*] diff --git a/metadata.json b/metadata.json index 0c62bad..0eddeb5 100644 --- a/metadata.json +++ b/metadata.json @@ -1,64 +1,64 @@ { - "name": "dfarrell07-opendaylight", - "version": "3.7.2", - "author": "Daniel Farrell", - "summary": "Puppet module that installs and configures the OpenDaylight SDN controller", - "license": "BSD-2-Clause", - "source": "https://github.com/dfarrell07/puppet-opendaylight", - "project_page": "https://github.com/dfarrell07/puppet-opendaylight", - "issues_url": "https://github.com/dfarrell07/puppet-opendaylight/issues", - "tags": [ - "OpenDaylight", - "ODL", - "SDN", - "networking", - "controller" - ], - "dependencies": [ - { - "name": "puppetlabs-stdlib", - "version_requirement": "4.x" - }, - { - "name": "camptocamp-archive", - "version_requirement": "0.x" - }, - { - "name": "puppetlabs-java", - "version_requirement": "1.x" - } - ], - "operatingsystem_support": [ - { - "operatingsystem": "RedHat", - "operatingsystemrelease": [ - "7" - ] - }, - { - "operatingsystem": "CentOS", - "operatingsystemrelease": [ - "7" - ] - }, - { - "operatingsystem": "Fedora", - "operatingsystemrelease": [ - "22", - "23" - ] - }, - { - "operatingsystem": "Ubuntu", - "operatingsystemrelease": [ - "14.04" - ] - } - ], - "requirements": [ - { - "name": "puppet", - "version_requirement": ">=3.4.0 <4.4.0" - } - ] + "name": "dfarrell07-opendaylight", + "version": "3.7.2", + "author": "Daniel Farrell", + "summary": "Puppet module that installs and configures the OpenDaylight SDN controller", + "license": "BSD-2-Clause", + "source": "https://github.com/dfarrell07/puppet-opendaylight", + "project_page": "https://github.com/dfarrell07/puppet-opendaylight", + "issues_url": "https://github.com/dfarrell07/puppet-opendaylight/issues", + "tags": [ + "OpenDaylight", + "ODL", + "SDN", + "networking", + "controller" + ], + "dependencies": [ + { + "name": "puppetlabs-stdlib", + "version_requirement": "4.x" + }, + { + "name": "camptocamp-archive", + "version_requirement": "0.x" + }, + { + "name": "puppetlabs-java", + "version_requirement": "1.x" + } + ], + "operatingsystem_support": [ + { + "operatingsystem": "RedHat", + "operatingsystemrelease": [ + "7" + ] + }, + { + "operatingsystem": "CentOS", + "operatingsystemrelease": [ + "7" + ] + }, + { + "operatingsystem": "Fedora", + "operatingsystemrelease": [ + "22", + "23" + ] + }, + { + "operatingsystem": "Ubuntu", + "operatingsystemrelease": [ + "14.04" + ] + } + ], + "requirements": [ + { + "name": "puppet", + "version_requirement": ">=3.4.0 <4.4.0" + } + ] } diff --git a/spec/acceptance/nodesets/centos-7-docker.yml b/spec/acceptance/nodesets/centos-7-docker.yml index c88ebe8..89b9fb6 100644 --- a/spec/acceptance/nodesets/centos-7-docker.yml +++ b/spec/acceptance/nodesets/centos-7-docker.yml @@ -1,3 +1,4 @@ +--- HOSTS: centos-7-docker: roles: diff --git a/spec/acceptance/nodesets/centos-7.yml b/spec/acceptance/nodesets/centos-7.yml index 90cfa42..466823a 100644 --- a/spec/acceptance/nodesets/centos-7.yml +++ b/spec/acceptance/nodesets/centos-7.yml @@ -1,3 +1,4 @@ +--- HOSTS: centos-7: roles: diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml index 2582a25..3de11f4 100644 --- a/spec/acceptance/nodesets/default.yml +++ b/spec/acceptance/nodesets/default.yml @@ -1,3 +1,4 @@ +--- HOSTS: centos-7: roles: diff --git a/spec/acceptance/nodesets/fedora-22.yml b/spec/acceptance/nodesets/fedora-22.yml index be3d3f3..6d07554 100644 --- a/spec/acceptance/nodesets/fedora-22.yml +++ b/spec/acceptance/nodesets/fedora-22.yml @@ -1,3 +1,4 @@ +--- HOSTS: fedora-22: roles: diff --git a/spec/acceptance/nodesets/fedora-23-docker.yml b/spec/acceptance/nodesets/fedora-23-docker.yml index bbde3c6..151fdb5 100644 --- a/spec/acceptance/nodesets/fedora-23-docker.yml +++ b/spec/acceptance/nodesets/fedora-23-docker.yml @@ -1,3 +1,4 @@ +--- HOSTS: fedora-23-docker: roles: diff --git a/spec/acceptance/nodesets/fedora-23.yml b/spec/acceptance/nodesets/fedora-23.yml index 91666bf..4d5d578 100644 --- a/spec/acceptance/nodesets/fedora-23.yml +++ b/spec/acceptance/nodesets/fedora-23.yml @@ -1,3 +1,4 @@ +--- HOSTS: fedora-23: roles: diff --git a/spec/acceptance/nodesets/ubuntu-1404-docker.yml b/spec/acceptance/nodesets/ubuntu-1404-docker.yml index 9b1c3d4..bc8ed83 100644 --- a/spec/acceptance/nodesets/ubuntu-1404-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-1404-docker.yml @@ -1,3 +1,4 @@ +--- HOSTS: ubuntu-1404-docker: platform: ubuntu-14.04-x64 diff --git a/spec/acceptance/nodesets/ubuntu-1404.yml b/spec/acceptance/nodesets/ubuntu-1404.yml index 3fde43d..09365ec 100644 --- a/spec/acceptance/nodesets/ubuntu-1404.yml +++ b/spec/acceptance/nodesets/ubuntu-1404.yml @@ -1,3 +1,4 @@ +--- HOSTS: ubuntu-1404: roles: -- 2.36.6