From 261c1c82f83deece603d143f29ecd1e4c9baff04 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 23 Jul 2014 12:10:05 -0600 Subject: [PATCH] Accommodate new python-keystoneclient 0.10.0 req's Change-Id: I1d1047b388457049776a72fa23a00d26f1e3ccbc --- cookbooks/mini-mon/metadata.rb | 2 +- cookbooks/mini-mon/recipes/default.rb | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cookbooks/mini-mon/metadata.rb b/cookbooks/mini-mon/metadata.rb index 2072a25..b057248 100644 --- a/cookbooks/mini-mon/metadata.rb +++ b/cookbooks/mini-mon/metadata.rb @@ -4,6 +4,6 @@ maintainer_email "hpcs-mon@hp.com" license "All rights reserved" description "Base setup for all vagrant boxes" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "0.0.10" +version "0.0.11" depends "apt" depends "influxdb" diff --git a/cookbooks/mini-mon/recipes/default.rb b/cookbooks/mini-mon/recipes/default.rb index 59632fb..a9ac607 100644 --- a/cookbooks/mini-mon/recipes/default.rb +++ b/cookbooks/mini-mon/recipes/default.rb @@ -20,10 +20,13 @@ rb.run_action(:create) # Run during compile time so that apt::cacher-client has # Add in the cacher-client, it will do something or nothing depending on the value of node[:apt][:cacher_ipaddress] include_recipe('apt::cacher-client') -# Some barebones distros do not yet have this installed -package 'apt-transport-https' do - action :install +# Install package dependencies +['apt-transport-https', 'libxml2-dev', 'libxslt1-dev'].each do |pkg| + package pkg do + action :install + end end + apt_repository 'dev' do uri 'https://region-a.geo-1.objects.hpcloudsvc.com/v1/46995959297574/mini-mon/public_repo' arch 'amd64'