Fix hieradata lookup paths

This requires we get the magical symlink between hieradata in
/opt/system-config to line up with the actual on disk environment
specific hiera location which differs between puppet 3 and 4.

Change-Id: Id4d7a0af72efddb758d94c6437bb1c331d12f406

tasks/main.yml

@@ -72,7 +72,7 @@
 
   - name: ensure hieradata manifest link is present
     file:
-      src: "{{ hieradata }}"
+      src: "{{ '/etc/puppet/hieradata' if puppet_version == '3' else '/etc/puppetlabs/code/environments' }}"
       dest: "{{ manifest_base }}/hieradata"
       state: link
     when: copy_hieradata

templates/hiera.yaml.j2

@@ -1,9 +1,14 @@
 ---
 :hierarchy:
   # Use private hieradata first
+  # Puppet3 paths
   - "hieradata/%{::environment}/fqdn/%{::fqdn}"
   - "hieradata/%{::environment}/group/%{group}" # no :: because group is set at nodescope
   - "hieradata/%{::environment}/common"
+  # Puppet4 paths
+  - "%{::environment}/hieradata/fqdn/%{::fqdn}"
+  - "%{::environment}/hieradata/group/%{group}" # no :: because group is set at nodescope
+  - "%{::environment}/hieradata/common"
   # Use public hieradata second, also be environmentally aware
   - "%{::environment}/hiera/fqdn/%{::fqdn}"
   - "%{::environment}/hiera/group/%{group}" # no :: because group is set at nodescope