From c129d7d41a7c8e6f55bfed515cf407ceedf19615 Mon Sep 17 00:00:00 2001 From: Stephan Renatus Date: Mon, 16 Jun 2014 15:31:02 +0200 Subject: [PATCH] Include the keystone client in the common recipe The client is needed in the call to openstack-common's cli library, identity_uuid, in the ruby_block. Change-Id: I0d5dbb18eb57ea848baf91bfce0eaa23a3c860fa Closes-Bug: #1330484 --- recipes/common.rb | 3 +++ spec/common_spec.rb | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/recipes/common.rb b/recipes/common.rb index 67f5162d..fb29bed4 100644 --- a/recipes/common.rb +++ b/recipes/common.rb @@ -22,6 +22,9 @@ ['quantum', 'neutron'].include?(node['openstack']['compute']['network']['service_type']) || return +# this is needed for querying the tenant_uuid of admin below +include_recipe 'openstack-identity::client' + require 'uri' # Make Openstack object available in Chef::Recipe diff --git a/spec/common_spec.rb b/spec/common_spec.rb index 56980d55..d50b2dc1 100644 --- a/spec/common_spec.rb +++ b/spec/common_spec.rb @@ -13,6 +13,10 @@ describe 'openstack-network::common' do include_context 'neutron-stubs' + it 'includes openstack-identity::client' do + expect(chef_run).to include_recipe('openstack-identity::client') + end + describe 'ml2_conf.ini' do let(:file) { chef_run.template('/etc/neutron/plugins/ml2/ml2_conf.ini') }