diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-03-04 13:24:39 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-03-04 13:24:39 -0300 |
| commit | 846876934b55e68554f935cb5101cb866d2f1cd6 (patch) | |
| tree | 5ed23fd73b6601346120841028ddce858c74ac66 /manifests | |
| parent | 4c1bab861dba2f1d8bca76b5545729189a508f54 (diff) | |
| download | puppet-bootstrap-846876934b55e68554f935cb5101cb866d2f1cd6.tar.gz puppet-bootstrap-846876934b55e68554f935cb5101cb866d2f1cd6.tar.bz2 | |
Move from config.pp to hiera
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/classes/configurator.pp | 16 | ||||
| -rw-r--r-- | manifests/config.pp | 21 | ||||
| -rw-r--r-- | manifests/host.pp | 5 |
3 files changed, 12 insertions, 30 deletions
diff --git a/manifests/classes/configurator.pp b/manifests/classes/configurator.pp index 3391481..b9b7e9e 100644 --- a/manifests/classes/configurator.pp +++ b/manifests/classes/configurator.pp @@ -8,10 +8,18 @@ # and want to configure it to boostrap a whole puppetmaster infrastructure. # -# Variables -$templates = "$bootstrap_path/templates" -$base_domain = hiera('bootstrap::base_domain', 'example.org') -$db_password = hiera('nodo::role::master::db_password', 'changeme') +# Basic variables +$templates = "$bootstrap_path/templates" +$base_domain = hiera('bootstrap::base_domain', 'example.org') +$db_password = hiera('nodo::role::master::db_password', 'changeme') +$mysql_rootpw = hiera('mysql::server::rootpw', '') +$root_password = hiera('bootstrap::root:password', 'rootpass') +$first_user = hiera('bootstrap::first_user', 'user') +$first_user_password = hiera('bootstrap::first_user::password', 'userpass') +$first_user_sshkey = hiera('bootstrap::first_user::sshkey', 'usersshkey') +$first_user_email = hiera('bootstrap::first_user::email', 'usermail') +$resolvconf_nameservers = hiera('nodo::subsystem::resolver::nameservers', '201.6.2.152:201.6.2.32') +$global_munin_allow = hiera('nodo::munin_node::allow', '192.168.0.[0-9]*') # Puppet configuration file { "$bootstrap_path/puppet.conf": diff --git a/manifests/config.pp b/manifests/config.pp deleted file mode 100644 index a4ea298..0000000 --- a/manifests/config.pp +++ /dev/null @@ -1,21 +0,0 @@ -# Use "mkpasswd -m sha-512" to generate root and first user's passwords -$root_password = "rootpass" -$first_user = "user" -$first_user_password = "userpass" -$first_user_sshkey = "usersshkey" # do not include "ssh-rsa " here. -$first_user_email = "usermail" - -# Bootstrap dirs -$puppet_bootstrap_tmpdir = "/var/tmp/puppet-bootstrap" -$puppet_dir = "/usr/local/puppet" - -# Minimal config for puppet-nodo first run -Exec { path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" } - -# Nameserver and munin configuration -$resolvconf_nameservers = '201.6.2.152:201.6.2.32' -$global_munin_allow = '192.168.0.[0-9]*' - -# MySQL configuration -$mysql_rootpw = "mysqlpass" -$puppetmaster_db_password = "puppetpass" diff --git a/manifests/host.pp b/manifests/host.pp index eecb81e..6cb2927 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -5,12 +5,7 @@ # # Import the needed config and modules -import "config.pp" import "nodo" -import "classes/admin_node.pp" -import "classes/firewall.pp" -import "classes/users.pp" -import "classes/default_conf.pp" # The server role include nodo::role::server |