From 28709a561b87c854046b31667ec7ac0c77198e83 Mon Sep 17 00:00:00 2001 From: Marton Kiss Date: Thu, 29 Jan 2015 09:02:18 +0100 Subject: [PATCH] Add standard puppet module files and .gitreview This module has been split out from system-config, and additional files are required to create a proper puppet module. Fix puppet lint compliance. Some of the files are described in the spec: http://specs.openstack.org/openstack-infra/infra-specs/specs/puppet-modules.html Change-Id: I92480816910b312de8b05e740147b2e5d627a018 --- .gitreview | 4 ++++ Rakefile | 8 ++++++++ manifests/init.pp | 4 +--- metadata.json | 23 +++++++++++++++++++++++ 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 .gitreview create mode 100644 Rakefile create mode 100644 metadata.json diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..c52f14e --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=review.openstack.org +port=29418 +project=openstack-infra/puppet-mediawiki.git diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000..7f22329 --- /dev/null +++ b/Rakefile @@ -0,0 +1,8 @@ +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') \ No newline at end of file diff --git a/manifests/init.pp b/manifests/init.pp index 83a705c..7e1ad97 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -16,9 +16,7 @@ class mediawiki( if ($role == 'app' or $role == 'all') { # This is equivalent to apache::dev which is not puppet3 # compatible with puppetlabs-apache 0.0.4: - package { ['libaprutil1-dev', - 'libapr1-dev', - 'apache2-prefork-dev']: + package { ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']: ensure => present, } diff --git a/metadata.json b/metadata.json new file mode 100644 index 0000000..37e31c6 --- /dev/null +++ b/metadata.json @@ -0,0 +1,23 @@ +{ + "name": "openstackci-mediawiki", + "version": "0.0.1", + "author": "Openstack CI", + "summary": "Puppet module for mediawiki", + "license": "Apache 2.0", + "source": "git://git.openstack.org/openstack-infra/puppet-mediawiki.git", + "project_page": "http://ci.openstack.org/", + "issues_url": "https://storyboard.openstack.org/#!/project/775", + "operatingsystem_support": [ + { "operatingsystem": "Ubuntu", "operatingsystemrelease": ["12.04"] } + ], + "requirements": [ + { "name": "pe", "version_requirement": ">= 3.2.0 < 3.4.0" }, + { "name": "puppet", "version_requirement": "3.x" } + ], + + "dependencies": [ + { "name": "puppetlabs/stdlib", "version_requirement": ">= 3.2.0" }, + { "name": "puppetlabs/apache", "version_requirement": "= 0.0.4" }, + { "name": "openstackci/vcsrepo", "version_requirement": "= 0.0.8" } + ] +}