Get rid of environments, use git branches instead

diff --git a/TODO.md b/TODO.md
index d401134d9ae630c16520ed36edeb81179278efed..6c5f6f4494ba6ae969aa301567f76e87e8814bfb 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -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
similarity index 100%
rename from hiera/production/domain/example.org/node/puppet-bootstrap.example.org.yaml
rename to hiera/domain/example.org/node/puppet-bootstrap.example.org.yaml

diff --git a/hiera/hiera.yaml b/hiera/hiera.yaml
index 33acc9e4c0a25731961eabf40abc04193d963841..96cfb878882127b3d770a0fe85bc0dbfbda7ab47 100644 (file)
--- 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