Remove keystone_url option
The keystone_url parameter is removed, please switch to common section "keystone_authtoken" to config. Change-Id: Iad8d33423f5fe206f5bd40e01ef57ee30e1579de Closes-Bug: #1651634
This commit is contained in:
parent
3010ef1dd7
commit
3f1b3a64d3
|
@ -10,10 +10,6 @@
|
||||||
#
|
#
|
||||||
# === API
|
# === API
|
||||||
#
|
#
|
||||||
# [*keystone_url*]
|
|
||||||
# URL for getting admin session.
|
|
||||||
# Default: $::os_service_default
|
|
||||||
#
|
|
||||||
# [*keystone_ec2_tokens_url*]
|
# [*keystone_ec2_tokens_url*]
|
||||||
# URL to authenticate token from ec2 request.
|
# URL to authenticate token from ec2 request.
|
||||||
# Default: $::os_service_default
|
# Default: $::os_service_default
|
||||||
|
@ -226,7 +222,6 @@
|
||||||
#
|
#
|
||||||
class ec2api::api (
|
class ec2api::api (
|
||||||
# API
|
# API
|
||||||
$keystone_url = $::os_service_default,
|
|
||||||
$keystone_ec2_tokens_url = $::os_service_default,
|
$keystone_ec2_tokens_url = $::os_service_default,
|
||||||
$ec2_timestamp_expiry = $::os_service_default,
|
$ec2_timestamp_expiry = $::os_service_default,
|
||||||
# Service
|
# Service
|
||||||
|
@ -292,7 +287,6 @@ class ec2api::api (
|
||||||
validate_bool($enabled)
|
validate_bool($enabled)
|
||||||
|
|
||||||
ec2api_config {
|
ec2api_config {
|
||||||
'DEFAULT/keystone_url': value => $keystone_url;
|
|
||||||
'DEFAULT/keystone_ec2_tokens_url': value => $keystone_ec2_tokens_url;
|
'DEFAULT/keystone_ec2_tokens_url': value => $keystone_ec2_tokens_url;
|
||||||
'DEFAULT/ec2_timestamp_expiry': value => $ec2_timestamp_expiry;
|
'DEFAULT/ec2_timestamp_expiry': value => $ec2_timestamp_expiry;
|
||||||
'DEFAULT/ec2api_listen': value => $ec2api_listen;
|
'DEFAULT/ec2api_listen': value => $ec2api_listen;
|
||||||
|
|
|
@ -31,9 +31,7 @@ describe 'basic ec2api' do
|
||||||
class { '::ec2api::keystone::authtoken':
|
class { '::ec2api::keystone::authtoken':
|
||||||
password => 'a_big_secret',
|
password => 'a_big_secret',
|
||||||
}
|
}
|
||||||
class { '::ec2api::api':
|
class { '::ec2api::api': }
|
||||||
keystone_url => 'http://127.0.0.1:5000/v2',
|
|
||||||
}
|
|
||||||
include ::ec2api::metadata
|
include ::ec2api::metadata
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
|
|
|
@ -8,7 +8,6 @@ describe 'ec2api::api', type: :class do
|
||||||
let(:facts) { facts.merge! @default_facts }
|
let(:facts) { facts.merge! @default_facts }
|
||||||
|
|
||||||
config_items = %w(
|
config_items = %w(
|
||||||
DEFAULT/keystone_url
|
|
||||||
DEFAULT/keystone_ec2_tokens_url
|
DEFAULT/keystone_ec2_tokens_url
|
||||||
DEFAULT/ec2_timestamp_expiry
|
DEFAULT/ec2_timestamp_expiry
|
||||||
DEFAULT/ec2api_listen
|
DEFAULT/ec2api_listen
|
||||||
|
|
Loading…
Reference in New Issue