Adding new params

StackStorm · May 26, 2016 · c0b0a91 · c0b0a91
1 parent da9fbbd
commit c0b0a91
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -48,13 +48,17 @@
 #    st2::revison: 11
 #
 class st2(
+  $install_st2              = $::st2::params::install_st2,
+  $install_chatops          = $::st2::params::install_chatops,
+  $install_web              = $::st2::params::install_Web,
   $version                  = '1.2.0',
   $revision                 = '8',
   $autoupdate               = false,
   $mistral_git_branch       = 'st2-1.2.0',
   $repo_base                = $::st2::params::repo_base,
   $repo_env                 = $::st2::params::repo_env,
   $conf_dir                 = $::st2::params::conf_dir,
+  $package_type             = $::st2::params::package_type,
   $conf_file                = "${::st2::params::conf_dir}/st2.conf",
   $use_ssl                  = false,
   $ssl_cert                 = '/etc/ssl/cert.crt',
@@ -72,7 +76,7 @@
   $cli_cache_token          = true,
   $cli_silence_ssl_warnings = false,
   $cli_username             = 'puppet',
-  $cli_password             = fqdn_rand_string(32),
+  $cli_password             = 'puppet',
   $cli_api_url              = 'http://localhost:9101',
   $cli_auth_url             = 'http://localhost:9100',
   $global_env               = false,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -39,6 +39,10 @@
     'auth'
   ]
 
+  $install_st2 = true
+  $install_chatops = true
+  $install_web = true
+
   $component_map = {
     actionrunner        => 'st2',
     api                 => 'st2',
@@ -164,6 +168,7 @@
   # so we need a way to determine what the init system.
   case $::osfamily {
     'RedHat': {
+      $package_type = 'rpm'
       if $::operatingsystem == 'Amazon' {
         $init_type = $::operatingsystemmajrelease ? {
           '2014'  => 'init',
@@ -179,6 +184,7 @@
       }
     }
     'Debian': {
+      $package_type = 'deb'
       if $::operatingsystem == 'Debian' {
         $init_type = $::operatingsystemmajrelease ? {
           '6'     => 'init',
@@ -197,6 +203,7 @@
       }
     }
     default: {
+      $package_type = undef
       $init_type = undef
     }
   }