Fix puppet lint errors

Required parameters must be listed first now, so this patch
brings required parameters to the top.

Also use infra_spec_helper for gem dependencies like other puppet
projects.

Change-Id: Ib9808fda496cada13d0b2b65e6f155022ebafdf9

Gemfile

@@ -1,36 +1,11 @@
 source 'https://rubygems.org'
 
-group :development, :test do
-  gem 'puppetlabs_spec_helper', :require => false
-
-  # Pin google-api-client after it released a ruby 2.0 only version
-  gem 'google-api-client', '0.9.4'
-
-  gem 'metadata-json-lint'
-  # This is nice and all, but let's not worry about it until we've actually
-  # got puppet 4.x sorted
-  # gem 'puppet-lint-param-docs'
-  gem 'puppet-lint-absolute_classname-check'
-  gem 'puppet-lint-absolute_template_path'
-  gem 'puppet-lint-trailing_newline-check'
-
-  # Puppet 4.x related lint checks
-  gem 'puppet-lint-unquoted_string-check'
+group :development, :test, :system_tests do
+  gem 'puppet-openstack_infra_spec_helper',
+      :git     => 'https://git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper',
+      :require => false
+  # Not all modules can do this, so we add it here to the ones that can
   gem 'puppet-lint-empty_string-check'
-  gem 'puppet-lint-leading_zero-check'
-  gem 'puppet-lint-variable_contains_upcase'
-  gem 'puppet-lint-spaceship_operator_without_tag-check'
-  gem 'puppet-lint-undef_in_function-check'
-
-  if puppetversion = ENV['PUPPET_GEM_VERSION']
-    gem 'puppet', puppetversion, :require => false
-  else
-    gem 'puppet', '~> 3.0', :require => false
-  end
-end
-
-group :system_tests do
-  gem 'beaker-rspec', :require => false
 end
 
 # vim:ft=ruby

manifests/init.pp

@@ -18,10 +18,10 @@
 # directly from its git repositories.
 #
 class refstack (
+  $mysql_user_password,
   $mysql_host          = 'localhost',
   $mysql_database      = 'refstack',
   $mysql_user          = 'refstack',
-  $mysql_user_password,
   $hostname            = $::fqdn,
   $protocol            = 'http',
 

manifests/params.pp

@@ -18,6 +18,13 @@
 #
 class refstack::params (
 
+  # [database] refstack.conf
+  $mysql_user_password,
+  $mysql_user             = 'refstack',
+  $mysql_host             = localhost,
+  $mysql_port             = 3306,
+  $mysql_database         = 'refstack',
+
   # Source and install directories.
   $src_root               = '/opt/refstack',
   $install_www_root       = '/var/www/refstack-www',
@@ -29,13 +36,6 @@ class refstack::params (
   $hostname               = $::fqdn,
   $protocol               = 'http',
 
-  # [database] refstack.conf
-  $mysql_user             = 'refstack',
-  $mysql_user_password,
-  $mysql_host             = localhost,
-  $mysql_port             = 3306,
-  $mysql_database         = 'refstack',
-
   # Apache2 ssl configuration
   $ssl_cert_content = undef,
   $ssl_cert         = '/etc/ssl/certs/ssl-cert-snakeoil.pem',