summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Nikitin <anikitin@mirantis.com>2016-03-21 11:45:51 +0300
committerAndrey Nikitin <anikitin@mirantis.com>2016-03-21 12:07:49 +0300
commitcd6889a35906586f6701eed86b53d04f938cb538 (patch)
treea771f232cf1de3178dc09aa575baf8ddff273cc1
parent9b833810f5ac080edeeba406e6af8e352213ab86 (diff)
Order of the classes parameters is refactored
Order and intendation of those parameters are changed to follow Puppet Style Guide recommendation [0]. Moreover, it will allow to an user to find much faster a variable in a list of variables. [0]. https://docs.puppetlabs.com/guides/style_guide.html Change-Id: If012896a95088ae836d5dfa35aa3cad553aee516
Notes
Notes (review): Code-Review+1: Arie Bregman <abregman@redhat.com> Code-Review+2: yolanda.robla <yroblamo@redhat.com> Code-Review+1: Ricardo Carrillo Cruz <ricardo.carrillo.cruz@gmail.com> Code-Review+2: Paul Belanger <pabelanger@redhat.com> Workflow+1: Paul Belanger <pabelanger@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 22 Mar 2016 15:42:55 +0000 Reviewed-on: https://review.openstack.org/295138 Project: openstack-infra/puppet-ethercalc Branch: refs/heads/master
-rw-r--r--manifests/apache.pp18
-rw-r--r--manifests/buildsource.pp4
-rw-r--r--manifests/init.pp8
-rw-r--r--manifests/mysql.pp2
-rw-r--r--manifests/site.pp8
5 files changed, 20 insertions, 20 deletions
diff --git a/manifests/apache.pp b/manifests/apache.pp
index faae63c..52b1548 100644
--- a/manifests/apache.pp
+++ b/manifests/apache.pp
@@ -1,15 +1,15 @@
1# == Class: etherpad_lite::apache 1# == Class: etherpad_lite::apache
2# 2#
3class etherpad_lite::apache ( 3class etherpad_lite::apache (
4 $vhost_name = $::fqdn, 4 $docroot = '/srv/etherpad-lite',
5 $docroot = '/srv/etherpad-lite', 5 $serveradmin = "webmaster@${::fqdn}",
6 $serveradmin = "webmaster@${::fqdn}", 6 $ssl_cert_file = '',
7 $ssl_cert_file = '', 7 $ssl_cert_file_contents = '', # If left empty puppet will not create file.
8 $ssl_key_file = '', 8 $ssl_chain_file = '',
9 $ssl_chain_file = '', 9 $ssl_chain_file_contents = '', # If left empty puppet will not create file.
10 $ssl_cert_file_contents = '', # If left empty puppet will not create file. 10 $ssl_key_file = '',
11 $ssl_key_file_contents = '', # If left empty puppet will not create file. 11 $ssl_key_file_contents = '', # If left empty puppet will not create file.
12 $ssl_chain_file_contents = '' # If left empty puppet will not create file. 12 $vhost_name = $::fqdn,
13) { 13) {
14 14
15 package { 'ssl-cert': 15 package { 'ssl-cert':
diff --git a/manifests/buildsource.pp b/manifests/buildsource.pp
index a2ebbd0..2b0c9fd 100644
--- a/manifests/buildsource.pp
+++ b/manifests/buildsource.pp
@@ -3,10 +3,10 @@
3# define to build from source using ./configure && make && make install. 3# define to build from source using ./configure && make && make install.
4# 4#
5define etherpad_lite::buildsource( 5define etherpad_lite::buildsource(
6 $creates = '/nonexistant/file',
6 $dir = $title, 7 $dir = $title,
7 $user = 'root',
8 $timeout = 300, 8 $timeout = 300,
9 $creates = '/nonexistant/file' 9 $user = 'root',
10) { 10) {
11 11
12 exec { "./configure in ${dir}": 12 exec { "./configure in ${dir}":
diff --git a/manifests/init.pp b/manifests/init.pp
index 64e377d..7c613c6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -12,13 +12,13 @@
12# 12#
13# 13#
14class etherpad_lite ( 14class etherpad_lite (
15 $ep_user = 'eplite',
16 $base_log_dir = '/var/log',
17 $base_install_dir = '/opt/etherpad-lite', 15 $base_install_dir = '/opt/etherpad-lite',
16 $base_log_dir = '/var/log',
17 $ep_ensure = 'present',
18 $ep_user = 'eplite',
19 $eplite_version = 'develop',
18 # If set to system will install system package. 20 # If set to system will install system package.
19 $nodejs_version = 'v0.10.21', 21 $nodejs_version = 'v0.10.21',
20 $eplite_version = 'develop',
21 $ep_ensure = 'present',
22) { 22) {
23 23
24 # where the modules are, needed to easily install modules later 24 # where the modules are, needed to easily install modules later
diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index 6014dac..2543817 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -1,10 +1,10 @@
1# == Class: puppet-etherpad_lite::mysql 1# == Class: puppet-etherpad_lite::mysql
2# 2#
3class etherpad_lite::mysql( 3class etherpad_lite::mysql(
4 $database_password,
4 $mysql_root_password, 5 $mysql_root_password,
5 $database_name = 'etherpad-lite', 6 $database_name = 'etherpad-lite',
6 $database_user = 'eplite', 7 $database_user = 'eplite',
7 $database_password,
8) { 8) {
9 class { '::mysql::server': 9 class { '::mysql::server':
10 root_password => $mysql_root_password, 10 root_password => $mysql_root_password,
diff --git a/manifests/site.pp b/manifests/site.pp
index ca2090d..cb2c3ae 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -3,11 +3,11 @@
3class etherpad_lite::site ( 3class etherpad_lite::site (
4 $database_password, 4 $database_password,
5 $etherpad_title, 5 $etherpad_title,
6 $session_key = '', 6 $database_host = 'localhost',
7 $db_type = 'mysql',
8 $database_user = 'eplite',
9 $database_name = 'etherpad-lite', 7 $database_name = 'etherpad-lite',
10 $database_host = 'localhost' 8 $database_user = 'eplite',
9 $db_type = 'mysql',
10 $session_key = '',
11) { 11) {
12 12
13 include ::etherpad_lite 13 include ::etherpad_lite