gnocchi: use new authtoken parameters
Configure Gnocchi with authtoken new class in the Puppet module, and also remove the useless parameters that didn't exist in the module. Change-Id: I414990c4fd5c5c1cd43d50c7a3947a4a29f4587a
This commit is contained in:
parent
85938c987c
commit
a19da8ef49
|
@ -13,6 +13,13 @@ parameters:
|
||||||
description: The password for the gnocchi service and db account.
|
description: The password for the gnocchi service and db account.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
|
GnocchiBackend:
|
||||||
|
default: file
|
||||||
|
description: The short name of the Gnocchi backend to use. Should be one
|
||||||
|
of swift, rbd, or file
|
||||||
|
type: string
|
||||||
|
constraints:
|
||||||
|
- allowed_values: ['swift', 'file', 'rbd']
|
||||||
KeystoneRegion:
|
KeystoneRegion:
|
||||||
type: string
|
type: string
|
||||||
default: 'regionOne'
|
default: 'regionOne'
|
||||||
|
@ -37,12 +44,20 @@ outputs:
|
||||||
dport:
|
dport:
|
||||||
- 8041
|
- 8041
|
||||||
- 13041
|
- 13041
|
||||||
gnocchi::api::keystone_tenant: 'service'
|
gnocchi::api::enabled: true
|
||||||
gnocchi::keystone::auth::tenant: 'service'
|
gnocchi::api::manage_service: false
|
||||||
gnocchi::keystone::auth::region: {get_param: KeystoneRegion}
|
gnocchi::api::service_name: 'httpd'
|
||||||
|
gnocchi::keystone::auth::admin_url: { get_param: [ EndpointMap, GnocchiAdmin, uri ] }
|
||||||
|
gnocchi::keystone::auth::internal_url: {get_param: [EndpointMap, GnocchiInternal, uri]}
|
||||||
gnocchi::keystone::auth::password: {get_param: GnocchiPassword}
|
gnocchi::keystone::auth::password: {get_param: GnocchiPassword}
|
||||||
gnocchi::keystone::auth::public_url: { get_param: [ EndpointMap, GnocchiPublic, uri ] }
|
gnocchi::keystone::auth::public_url: { get_param: [ EndpointMap, GnocchiPublic, uri ] }
|
||||||
gnocchi::keystone::auth::internal_url: {get_param: [EndpointMap, GnocchiInternal, uri]}
|
gnocchi::keystone::auth::region: {get_param: KeystoneRegion}
|
||||||
gnocchi::keystone::auth::admin_url: { get_param: [ EndpointMap, GnocchiAdmin, uri ] }
|
gnocchi::keystone::auth::tenant: 'service'
|
||||||
|
gnocchi::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
|
||||||
|
gnocchi::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||||
|
gnocchi::keystone::authtoken::password: {get_param: GnocchiPassword}
|
||||||
|
gnocchi::keystone::authtoken::project_name: 'service'
|
||||||
|
gnocchi::wsgi::apache::ssl: false
|
||||||
|
tripleo::profile::base::gnocchi::api::gnocchi_backend: {get_param: GnocchiBackend}
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::gnocchi::api
|
include ::tripleo::profile::base::gnocchi::api
|
||||||
|
|
|
@ -9,13 +9,6 @@ parameters:
|
||||||
description: Mapping of service endpoint -> protocol. Typically set
|
description: Mapping of service endpoint -> protocol. Typically set
|
||||||
via parameter_defaults in the resource registry.
|
via parameter_defaults in the resource registry.
|
||||||
type: json
|
type: json
|
||||||
GnocchiBackend:
|
|
||||||
default: file
|
|
||||||
description: The short name of the Gnocchi backend to use. Should be one
|
|
||||||
of swift, rbd, or file
|
|
||||||
type: string
|
|
||||||
constraints:
|
|
||||||
- allowed_values: ['swift', 'file', 'rbd']
|
|
||||||
GnocchiIndexerBackend:
|
GnocchiIndexerBackend:
|
||||||
default: 'mysql'
|
default: 'mysql'
|
||||||
description: The short name of the Gnocchi indexer backend to use.
|
description: The short name of the Gnocchi indexer backend to use.
|
||||||
|
@ -62,13 +55,6 @@ outputs:
|
||||||
- '/gnocchi'
|
- '/gnocchi'
|
||||||
gnocchi::db::mysql::password: {get_param: GnocchiPassword}
|
gnocchi::db::mysql::password: {get_param: GnocchiPassword}
|
||||||
gnocchi::db::sync::extra_opts: '--skip-storage --create-legacy-resource-types'
|
gnocchi::db::sync::extra_opts: '--skip-storage --create-legacy-resource-types'
|
||||||
#Gnocchi API
|
|
||||||
tripleo::profile::base::gnocchi::api::gnocchi_backend: {get_param: GnocchiBackend}
|
|
||||||
gnocchi::api::manage_service: false
|
|
||||||
gnocchi::api::enabled: true
|
|
||||||
gnocchi::api::service_name: 'httpd'
|
|
||||||
gnocchi::api::keystone_password: {get_param: GnocchiPassword}
|
|
||||||
gnocchi::wsgi::apache::ssl: false
|
|
||||||
gnocchi::storage::coordination_url:
|
gnocchi::storage::coordination_url:
|
||||||
list_join:
|
list_join:
|
||||||
- ''
|
- ''
|
||||||
|
@ -102,5 +88,3 @@ outputs:
|
||||||
gnocchi::db::mysql::allowed_hosts:
|
gnocchi::db::mysql::allowed_hosts:
|
||||||
- '%'
|
- '%'
|
||||||
- "%{hiera('mysql_bind_host')}"
|
- "%{hiera('mysql_bind_host')}"
|
||||||
gnocchi::auth::auth_region: {get_param: KeystoneRegion}
|
|
||||||
gnocchi::auth::auth_tenant_name: 'service'
|
|
||||||
|
|
Loading…
Reference in New Issue