Remove deprecated puppet-keystone modules related to admin auth

The following classes and parameters were deprecated in puppet-keystone
when keystone::bootstrap was added, and we don't need to set them
anymore because now we use new parameters.

 - keystone::roles::admin
 - keystone::endpoint
 - keystone::admin_token
 - keystone::admin_password

[1] I683fcdd743bddf6d4e989dd7e7c553db745934db
Change-Id: Id810756819505df1b21a86798bce1761515a001a
changes/21/717421/1
Takashi Kajinami 3 years ago
parent 7342b6a62d
commit 1de0294ba8
  1. 11
      deployment/keystone/keystone-container-puppet.yaml

@ -377,9 +377,6 @@ outputs:
read_default_group: tripleo
keystone::token_expiration: {get_param: TokenExpiration}
keystone::admin_token: {get_param: AdminToken}
keystone::admin_password: {get_param: AdminPassword}
keystone::roles::admin::password: {get_param: AdminPassword}
keystone::bootstrap::password: {get_param: AdminPassword}
keystone::policy::policies: {get_param: KeystonePolicies}
keystone_ssl_certificate: {get_param: KeystoneSSLCertificate}
@ -404,22 +401,14 @@ outputs:
keystone::notification_driver: {get_param: NotificationDriver}
keystone::notification_format: {get_param: KeystoneNotificationFormat}
tripleo::profile::base::keystone::extra_notification_topics: {get_param: KeystoneNotificationTopics}
keystone::roles::admin::email: {get_param: AdminEmail}
keystone::bootstrap::email: {get_params: AdminEmail}
keystone::endpoint::public_url: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}
keystone::endpoint::internal_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
keystone::endpoint::admin_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
keystone::endpoint::region: {get_param: KeystoneRegion}
keystone::endpoint::version: ''
keystone::bootstrap::public_url: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}
keystone::bootstrap::internal_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
keystone::bootstrap::admin_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
keystone::bootstrap::region: {get_param: KeystoneRegion}
keystone::admin_port: {get_param: [EndpointMap, KeystoneAdmin, port]}
keystone::rabbit_heartbeat_timeout_threshold: 60
keystone::roles::admin::service_tenant: 'service'
keystone::bootstrap::service_project_name: 'service'
keystone::roles::admin::admin_tenant: 'admin'
keystone::bootstrap::project_name: 'admin'
keystone::config::keystone_config:
ec2/driver:

Loading…
Cancel
Save