Add .gitreview & fix puppet-lint errors/warnings

There were mainly alignment issues with =>, so those were fixed.
Also removed the charset declaration in mysql.pp as refstack itself
now takes care of this.

Change-Id: Ia1635bfe51669000374fd445d460081551cb978d
This commit is contained in:
Paul Van Eck 2015-07-06 17:08:07 -07:00
parent 32a1e60a5b
commit f23cdca396
8 changed files with 51 additions and 48 deletions

4
.gitreview Normal file
View File

@ -0,0 +1,4 @@
[gerrit]
host=review.openstack.org
port=29418
project=openstack-infra/puppet-refstack.git

View File

@ -39,27 +39,27 @@ class refstack::apache::http () {
# Create a copy of the wsgi file with apache user permissions.
file { '/etc/refstack/app.wsgi':
ensure => present,
owner => $::apache::params::user,
group => $::apache::params::group,
mode => '0644',
ensure => present,
owner => $::apache::params::user,
group => $::apache::params::group,
mode => '0644',
source => "${src_www_root}/refstack/api/app.wsgi",
require => [
require => [
Class['refstack::api']
],
notify => Service['httpd'],
notify => Service['httpd'],
}
# Synchronize the app directory and the apache directory.
file { $install_www_root:
ensure => directory,
owner => $::apache::params::user,
group => $::apache::params::group,
source => "${src_www_root}/refstack-ui/app",
recurse => true,
purge => true,
force => true,
notify => Service['httpd'],
ensure => directory,
owner => $::apache::params::user,
group => $::apache::params::group,
source => "${src_www_root}/refstack-ui/app",
recurse => true,
purge => true,
force => true,
notify => Service['httpd'],
}
# Set up refstack as HTTP

View File

@ -31,7 +31,7 @@ class refstack::apache::https () {
$group = $::refstack::params::group
$server_admin = $::refstack::params::server_admin
$python_version = $::refstack::params::python_version
$ssl_cert_content = $::refstack::params::ssl_cert_content
$ssl_cert = $::refstack::params::ssl_cert
$ssl_key_content = $::refstack::params::ssl_key_content
@ -46,15 +46,15 @@ class refstack::apache::https () {
# Create a copy of the wsgi file with apache user permissions.
file { '/etc/refstack/app.wsgi':
ensure => present,
owner => $::apache::params::user,
group => $::apache::params::group,
mode => '0644',
ensure => present,
owner => $::apache::params::user,
group => $::apache::params::group,
mode => '0644',
source => "${src_www_root}/refstack/api/app.wsgi",
require => [
require => [
Class['refstack::api']
],
notify => Service['httpd'],
notify => Service['httpd'],
}
if $ssl_cert_content != undef {
@ -89,14 +89,14 @@ class refstack::apache::https () {
# Synchronize the app directory and the apache directory.
file { $install_www_root:
ensure => directory,
owner => $::apache::params::user,
group => $::apache::params::group,
source => "${src_www_root}/refstack-ui/app",
recurse => true,
purge => true,
force => true,
notify => Service['httpd'],
ensure => directory,
owner => $::apache::params::user,
group => $::apache::params::group,
source => "${src_www_root}/refstack-ui/app",
recurse => true,
purge => true,
force => true,
notify => Service['httpd'],
}
# Set up ::refstack as HTTPS

View File

@ -80,20 +80,20 @@ class refstack::api () {
# Create the install directory and virtual environment
file { $install_api_root:
ensure => directory,
owner => $user,
group => $group,
ensure => directory,
owner => $user,
group => $group,
}
python::virtualenv { $install_api_root:
ensure => present,
version => $python_version,
owner => $user,
group => $group,
require => [
ensure => present,
version => $python_version,
owner => $user,
group => $group,
require => [
File[$install_api_root],
Class['python::install'],
],
systempkgs => true,
systempkgs => true,
}
# Run pip from the venv, install refstack.

View File

@ -68,7 +68,7 @@ class refstack::app () {
# Run NPM Install
exec { 'npm install':
command => 'npm install',
path => "/usr/local/bin:/usr/bin:/bin/",
path => '/usr/local/bin:/usr/bin:/bin/',
cwd => $src_www_root,
user => $user,
group => $group,

View File

@ -27,10 +27,10 @@ class refstack (
# Configure the entire refstack instance. This does not install anything,
# but ensures that variables are consistent across all modules.
class { '::refstack::params':
mysql_database => $mysql_database,
mysql_user => $mysql_user,
mysql_user_password => $mysql_user_password,
hostname => $hostname
mysql_database => $mysql_database,
mysql_user => $mysql_user,
mysql_user_password => $mysql_user_password,
hostname => $hostname
}
include ::refstack::mysql

View File

@ -35,6 +35,5 @@ class refstack::mysql () {
password => $mysql_user_password,
host => 'localhost',
grant => ['all'],
charset => 'latin1', #TODO(krotscheck):Remove once 176364 merges
}
}
}

View File

@ -1,6 +1,6 @@
node default {
class { 'refstack':
hostname => '192.168.99.88',
mysql_user_password => 'refstack',
hostname => '192.168.99.88',
mysql_user_password => 'refstack',
}
}
}