diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2015-09-25 18:12:31 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2015-09-25 18:12:31 -0300 |
commit | 4fc808f0673f42c7fae8519d793acea186aa092d (patch) | |
tree | 4b30961f69428811a2885aab0eeae3ec7e5804d9 | |
parent | 47bc02001105b82d27454020d55e431773e92602 (diff) | |
download | puppet-bootstrap-4fc808f0673f42c7fae8519d793acea186aa092d.tar.gz puppet-bootstrap-4fc808f0673f42c7fae8519d793acea186aa092d.tar.bz2 |
Get rid of environments, use git branches instead
-rw-r--r-- | TODO.md | 4 | ||||
-rw-r--r-- | hiera/domain/example.org/node/puppet-bootstrap.example.org.yaml (renamed from hiera/production/domain/example.org/node/puppet-bootstrap.example.org.yaml) | 0 | ||||
-rw-r--r-- | hiera/hiera.yaml | 14 |
3 files changed, 9 insertions, 9 deletions
@@ -5,6 +5,7 @@ High priority ------------- - puppet: masterless: + - fix hiera default boolean value when true. - keyringer/gpg integration. - https://github.com/compete/hiera_yamlgpg - https://github.com/crayfishx/hiera-gpg @@ -29,6 +30,7 @@ High priority - manage client's /root/.ssh/config: `HostKeyAlgorithms ssh-rsa`. - force option via rsync/rdiff handlers. - virtual: migrate to kvm/libvirt. +- nodo: run stages - loginrecords: deploy module. Medium priority @@ -80,8 +82,6 @@ Low priority - https://packages.debian.org/jessie/git-notifier - https://github.com/mhagger/git-multimail - using OpenPGP? -- nodo: - - decrease http://www.cups.org/doc-1.1/sam.html#Timeout on cupds.conf from laptops that use remote printers set on client.conf. - syslog-ng: use conf.d - etherpad: `You need to set a sessionKey value in settings.json`. - knock integration via https://github.com/juasiepo/knockd diff --git a/hiera/production/domain/example.org/node/puppet-bootstrap.example.org.yaml b/hiera/domain/example.org/node/puppet-bootstrap.example.org.yaml index deec4fa..deec4fa 100644 --- a/hiera/production/domain/example.org/node/puppet-bootstrap.example.org.yaml +++ b/hiera/domain/example.org/node/puppet-bootstrap.example.org.yaml diff --git a/hiera/hiera.yaml b/hiera/hiera.yaml index 33acc9e..96cfb87 100644 --- a/hiera/hiera.yaml +++ b/hiera/hiera.yaml @@ -10,12 +10,12 @@ # See http://docs.vagrantup.com/v2/provisioning/puppet_apply.html :datadir: hiera :hierarchy: - - '%{::environment}/domain/%{::domain}/node/%{::clientcert}' - - '%{::environment}/domain/%{::domain}/role/%{::role}' - - '%{::environment}/domain/%{::domain}/location/%{::location}' - - '%{::environment}/domain/%{::domain}/%{::domain}' - - '%{::environment}/location/%{::location}' - - '%{::environment}/virtual/%{::virtual}' - - '%{::environment}/role/%{::role}' + - 'domain/%{::domain}/node/%{::clientcert}' + - 'domain/%{::domain}/role/%{::role}' + - 'domain/%{::domain}/location/%{::location}' + - 'domain/%{::domain}/%{::domain}' + - 'location/%{::location}' + - 'virtual/%{::virtual}' + - 'role/%{::role}' - bootstrap - common |