From 900266e84f116bcf78800911dda8d8c44cb26248 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 13 Nov 2023 02:00:09 +0900 Subject: [PATCH] metadata: Remove unnecessary class inclusions The nova::metadata class contains only resources to manage options and should be used along with the nova::api class to launch the service. Thus we don't have to include the keystoneauth class or the db class from this class because these are included by the api class. Change-Id: I457f6b31cee4653358343e71b1e1c96ca7fdabe7 --- manifests/metadata.pp | 2 -- spec/classes/nova_metadata_spec.rb | 9 --------- 2 files changed, 11 deletions(-) diff --git a/manifests/metadata.pp b/manifests/metadata.pp index 30a6dce8c..e997741b2 100644 --- a/manifests/metadata.pp +++ b/manifests/metadata.pp @@ -36,8 +36,6 @@ class nova::metadata( ) inherits nova::params { include nova::deps - include nova::db - include nova::keystone::authtoken nova_config { 'api/dhcp_domain': value => $dhcp_domain; diff --git a/spec/classes/nova_metadata_spec.rb b/spec/classes/nova_metadata_spec.rb index 63befcde8..baa0d30c9 100644 --- a/spec/classes/nova_metadata_spec.rb +++ b/spec/classes/nova_metadata_spec.rb @@ -2,13 +2,6 @@ require 'spec_helper' describe 'nova::metadata' do - let :pre_condition do - "include nova - class { 'nova::keystone::authtoken': - password => 'passw0rd', - }" - end - let :params do {} end @@ -17,8 +10,6 @@ describe 'nova::metadata' do context 'with default parameters' do - it { is_expected.to contain_class('nova::keystone::authtoken') } - it 'configures various stuff' do is_expected.to contain_nova_config('api/metadata_cache_expiration').with('value' => '') is_expected.to contain_nova_config('api/local_metadata_per_cell').with('value' => '')