diff --git a/manifests/api.pp b/manifests/api.pp index 7fc6357..779474d 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -10,10 +10,6 @@ # # === API # -# [*keystone_url*] -# URL for getting admin session. -# Default: $::os_service_default -# # [*keystone_ec2_tokens_url*] # URL to authenticate token from ec2 request. # Default: $::os_service_default @@ -226,7 +222,6 @@ # class ec2api::api ( # API - $keystone_url = $::os_service_default, $keystone_ec2_tokens_url = $::os_service_default, $ec2_timestamp_expiry = $::os_service_default, # Service @@ -292,7 +287,6 @@ class ec2api::api ( validate_bool($enabled) ec2api_config { - 'DEFAULT/keystone_url': value => $keystone_url; 'DEFAULT/keystone_ec2_tokens_url': value => $keystone_ec2_tokens_url; 'DEFAULT/ec2_timestamp_expiry': value => $ec2_timestamp_expiry; 'DEFAULT/ec2api_listen': value => $ec2api_listen; diff --git a/spec/acceptance/basic_ec2api_spec.rb b/spec/acceptance/basic_ec2api_spec.rb index 8395a54..6596249 100644 --- a/spec/acceptance/basic_ec2api_spec.rb +++ b/spec/acceptance/basic_ec2api_spec.rb @@ -31,9 +31,7 @@ describe 'basic ec2api' do class { '::ec2api::keystone::authtoken': password => 'a_big_secret', } - class { '::ec2api::api': - keystone_url => 'http://127.0.0.1:5000/v2', - } + class { '::ec2api::api': } include ::ec2api::metadata } default: { diff --git a/spec/classes/ec2api_api_spec.rb b/spec/classes/ec2api_api_spec.rb index 3d49393..3d6a974 100644 --- a/spec/classes/ec2api_api_spec.rb +++ b/spec/classes/ec2api_api_spec.rb @@ -8,7 +8,6 @@ describe 'ec2api::api', type: :class do let(:facts) { facts.merge! @default_facts } config_items = %w( - DEFAULT/keystone_url DEFAULT/keystone_ec2_tokens_url DEFAULT/ec2_timestamp_expiry DEFAULT/ec2api_listen