Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/infrastructure-puppet-kitchen
diff --git a/.kitchen.yml b/.kitchen.yml
index 57c0835..5a59d75 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -29,7 +29,7 @@
- name: ubuntu1464
driver:
box: ubuntu1464-puppet
- box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-puppet/versions/1.0.1/providers/virtualbox.box
+ box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-puppet/versions/1.0.3/providers/virtualbox.box
- name: ubuntu1664
driver:
box: ubuntu/xenial64
diff --git a/puppet/hiera.yaml b/puppet/hiera.yaml
index ff8b3aa..88cfb2c 100644
--- a/puppet/hiera.yaml
+++ b/puppet/hiera.yaml
@@ -6,7 +6,7 @@
# - "%{::virtual}/%{::asfosname}" # only enal be this if you use a caching service like apt-cacher-ng
- "nodes/%{::hostname}"
- "%{::asfosname}/%{::asfosrelease}"
- - "colo/%{::asfcolo}"
+# - "colo/%{::asfcolo}"
- "oem/%{::oem}"
- "common"
