Merge "metadata: Remove unnecessary class inclusions"

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;

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' => '<SERVICE DEFAULT>')
         is_expected.to contain_nova_config('api/local_metadata_per_cell').with('value' => '<SERVICE DEFAULT>')