comment out extraneous asfcolo stuff. bump 14.04 box rev to 1.0.3
diff --git a/.kitchen.yml b/.kitchen.yml
index c81f1aa..59d0b8a 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -17,16 +17,18 @@
hiera_deep_merge: true
vm_hostname: 'test'
require_chef_for_busser: false
- require_puppet_repo: false
- puppet_logdest:
- - 'console'
+ puppet_debug: false
+ puppet_verbose: true
+ # require_puppet_repo: false
+ # puppet_logdest:
+ # - 'console'
#http_proxy: 'http://192.168.1.3:3142' # Disable this unless you use apt-cacher-ng or something that caches
platforms:
- 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"