From 029a30ae157f92c18d0d62842d35c754f7daca96 Mon Sep 17 00:00:00 2001 From: Ramy Asselin Date: Mon, 20 Apr 2015 12:02:19 -0700 Subject: [PATCH] Rename openstackci to openstackinfra Also fix lint issues Change-Id: I5e261a2c235bba7843bb346a1d8d04d8fc0b71a6 --- .gitreview | 4 ++++ manifests/init.pp | 10 +++++----- metadata.json | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 .gitreview diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..7561e85 --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=review.openstack.org +port=29418 +project=openstack-infra/puppet-puppet.git diff --git a/manifests/init.pp b/manifests/init.pp index 6718b9c..18a87f1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -46,7 +46,7 @@ class puppet ( $pin_puppetdb = '2.' } default: { - fail("Puppet version not supported") + fail('Puppet version not supported') } } @@ -72,7 +72,7 @@ class puppet ( if ($::osfamily == 'Debian') { # check version - trusty only has puppet 3 if ($::lsbdistcodename == 'trusty') and ($pin_puppet == '2.7.') { - fail("Puppet 2.7 version not supported") + fail('Puppet 2.7 version not supported') } apt::source { 'puppetlabs': @@ -122,7 +122,7 @@ class puppet ( if ($::osfamily == 'RedHat') { # check version - 7 only has puppet 3 if ($::operatingsystemmajrelease == 7) and ($pin_puppet == '2.7.') { - fail("Puppet 2.7 version not supported") + fail('Puppet 2.7 version not supported') } file { '/etc/yum.repos.d/puppetlabs.repo': @@ -130,7 +130,7 @@ class puppet ( owner => 'root', group => 'root', mode => '0444', - content => template('puppet/centos-puppetlabs.repo.erb'), + content => template('puppet/centos-puppetlabs.repo.erb'), replace => true, } file { '/etc/yum.conf': @@ -171,6 +171,6 @@ class puppet ( ensure => stopped, enable => false, } - } + } } diff --git a/metadata.json b/metadata.json index df84041..a55e940 100644 --- a/metadata.json +++ b/metadata.json @@ -1,5 +1,5 @@ { - "name": "openstackci-puppet", + "name": "openstackinfra-puppet", "version": "0.0.1", "author": "OpenStack CI", "summary": "Puppet module to install and configure Puppet",