From a6438a2082792e7528bfed682c64e352367f8f6f Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Thu, 19 May 2016 00:13:11 +0200 Subject: Pass MysqlVirtualIP via EndpointMap By passing the MysqlVirtualIP via the EndpointMap we won't need it to be provided as a parameter to the services. This follows what is already happening for the glance registry service with I9186e56cd4746a60e65dc5ac12e6595ac56505f0. Change-Id: Iad2ab389bf64d0fc8b06eb0e7d29b5370ff27dff Co-Authored-By: Juan Antonio Osorio Robles --- puppet/services/glance-api.yaml | 11 ++++------- puppet/services/glance-registry.yaml | 11 ++++------- puppet/services/heat-api-cfn.yaml | 3 --- puppet/services/heat-api-cloudwatch.yaml | 3 --- puppet/services/heat-api.yaml | 3 --- puppet/services/heat-engine.yaml | 11 ++++------- puppet/services/keystone.yaml | 11 ++++------- puppet/services/loadbalancer.yaml | 3 --- puppet/services/memcached.yaml | 4 ---- puppet/services/neutron-dhcp.yaml | 3 --- puppet/services/neutron-l3.yaml | 3 --- puppet/services/neutron-metadata.yaml | 3 --- puppet/services/pacemaker/glance-api.yaml | 4 ---- puppet/services/pacemaker/glance-registry.yaml | 4 ---- puppet/services/pacemaker/heat-api-cfn.yaml | 4 ---- puppet/services/pacemaker/heat-api-cloudwatch.yaml | 4 ---- puppet/services/pacemaker/heat-api.yaml | 4 ---- puppet/services/pacemaker/heat-engine.yaml | 4 ---- puppet/services/pacemaker/keystone.yaml | 4 ---- puppet/services/pacemaker/loadbalancer.yaml | 4 ---- puppet/services/pacemaker/memcached.yaml | 4 ---- puppet/services/pacemaker/neutron-dhcp.yaml | 4 ---- puppet/services/pacemaker/neutron-l3.yaml | 4 ---- puppet/services/pacemaker/neutron-metadata.yaml | 4 ---- puppet/services/pacemaker/rabbitmq.yaml | 4 ---- puppet/services/rabbitmq.yaml | 3 --- puppet/services/services.yaml | 5 ----- 27 files changed, 16 insertions(+), 113 deletions(-) (limited to 'puppet/services') diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml index ca50d91d..89e6ee0f 100644 --- a/puppet/services/glance-api.yaml +++ b/puppet/services/glance-api.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' Debug: default: '' description: Set to True to enable debugging on all services. @@ -63,13 +60,14 @@ outputs: description: Role data for the Glance API role. value: config_settings: - glance_dsn: &glance_dsn + glance::api::database_connection: list_join: - '' - - - 'mysql+pymysql://glance:' + - - {get_param: [EndpointMap, MysqlInternal, protocol]} + - '://glance:' - {get_param: GlancePassword} - '@' - - {get_param: MysqlVirtualIPUri} + - {get_param: [EndpointMap, MysqlInternal, host]} - '/glance' glance::api::bind_port: {get_param: [EndpointMap, GlanceInternal, port]} glance::api::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } @@ -84,7 +82,6 @@ outputs: glance::api::workers: {get_param: GlanceWorkers} glance_notifier_strategy: {get_param: GlanceNotifierStrategy} glance_log_file: {get_param: GlanceLogFile} - glance::api::database_connection: *glance_dsn glance::backend::swift::swift_store_auth_address: {get_param: [EndpointMap, KeystoneInternal, uri] } glance::backend::swift::swift_store_user: service:glance glance::backend::swift::swift_store_key: {get_param: GlancePassword} diff --git a/puppet/services/glance-registry.yaml b/puppet/services/glance-registry.yaml index 1a1a515a..6f2f0372 100644 --- a/puppet/services/glance-registry.yaml +++ b/puppet/services/glance-registry.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' Debug: default: '' description: Set to True to enable debugging on all services. @@ -30,16 +27,16 @@ outputs: description: Role data for the Glance Registry role. value: config_settings: - glance_dsn: &glance_dsn + glance::registry::database_connection: list_join: - '' - - - 'mysql+pymysql://glance:' + - - {get_param: [EndpointMap, MysqlInternal, protocol]} + - '://glance:' - {get_param: GlancePassword} - '@' - - {get_param: MysqlVirtualIPUri} + - {get_param: [EndpointMap, MysqlInternal, host]} - '/glance' glance::registry::keystone_password: {get_param: GlancePassword} - glance::registry::database_connection: *glance_dsn glance::registry::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } glance::registry::identity_uri: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] } glance::registry::debug: {get_param: Debug} diff --git a/puppet/services/heat-api-cfn.yaml b/puppet/services/heat-api-cfn.yaml index 99eb1074..c1f26c15 100644 --- a/puppet/services/heat-api-cfn.yaml +++ b/puppet/services/heat-api-cfn.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' HeatWorkers: default: 0 description: Number of workers for Heat service. diff --git a/puppet/services/heat-api-cloudwatch.yaml b/puppet/services/heat-api-cloudwatch.yaml index f3d68042..2c56951b 100644 --- a/puppet/services/heat-api-cloudwatch.yaml +++ b/puppet/services/heat-api-cloudwatch.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' HeatWorkers: default: 0 description: Number of workers for Heat service. diff --git a/puppet/services/heat-api.yaml b/puppet/services/heat-api.yaml index 4fc259ac..d3461e63 100644 --- a/puppet/services/heat-api.yaml +++ b/puppet/services/heat-api.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' HeatWorkers: default: 0 description: Number of workers for Heat service. diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml index 143d24bb..51807f92 100644 --- a/puppet/services/heat-engine.yaml +++ b/puppet/services/heat-engine.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' HeatEnableDBPurge: type: boolean default: true @@ -43,19 +40,19 @@ outputs: - get_attr: [HeatBase, role_data, config_settings] - heat::engine::num_engine_workers: {get_param: HeatWorkers} tripleo::profile::base::heat::manage_db_purge: {get_param: HeatEnableDBPurge} - heat_dsn: &heat_dsn + heat::database_connection: list_join: - '' - - - 'mysql+pymysql://heat:' + - - {get_param: [EndpointMap, MysqlInternal, protocol]} + - '://heat:' - {get_param: HeatPassword} - '@' - - {get_param: MysqlVirtualIPUri} + - {get_param: [EndpointMap, MysqlInternal, host]} - '/heat' heat::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} heat::keystone_ec2_uri: {get_param: [EndpointMap, KeystoneEC2, uri]} heat::identity_uri: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} heat::keystone_password: {get_param: HeatPassword} - heat::database_connection: *heat_dsn heat::db::mysql::password: {get_param: HeatPassword} heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword} step_config: | diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml index 1654f0e7..25d92d4a 100644 --- a/puppet/services/keystone.yaml +++ b/puppet/services/keystone.yaml @@ -54,9 +54,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' Debug: type: string default: '' @@ -97,15 +94,15 @@ outputs: description: Role data for the Keystone role. value: config_settings: - keystone_dsn: &keystone_dsn + keystone::database_connection: list_join: - '' - - - 'mysql+pymysql://keystone:' + - - {get_param: [EndpointMap, MysqlInternal, protocol]} + - '://keystone:' - {get_param: AdminToken} - '@' - - {get_param: MysqlVirtualIPUri} + - {get_param: [EndpointMap, MysqlInternal, host]} - '/keystone' - keystone::database_connection: *keystone_dsn keystone::admin_token: {get_param: AdminToken} keystone::roles::admin::password: {get_param: AdminPassword} keystone_ca_certificate: {get_param: KeystoneCACertificate} diff --git a/puppet/services/loadbalancer.yaml b/puppet/services/loadbalancer.yaml index 0c1757bf..1b9654fc 100644 --- a/puppet/services/loadbalancer.yaml +++ b/puppet/services/loadbalancer.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' outputs: role_data: diff --git a/puppet/services/memcached.yaml b/puppet/services/memcached.yaml index 1833fbff..fcd0adca 100644 --- a/puppet/services/memcached.yaml +++ b/puppet/services/memcached.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' outputs: role_data: @@ -20,4 +17,3 @@ outputs: config_settings: step_config: | include ::tripleo::profile::base::memcached - diff --git a/puppet/services/neutron-dhcp.yaml b/puppet/services/neutron-dhcp.yaml index 548b4ba0..80ccf1c2 100644 --- a/puppet/services/neutron-dhcp.yaml +++ b/puppet/services/neutron-dhcp.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' NeutronEnableIsolatedMetadata: default: 'False' description: If True, DHCP provide metadata route to VM. diff --git a/puppet/services/neutron-l3.yaml b/puppet/services/neutron-l3.yaml index 2ea1b19d..20c82dc1 100644 --- a/puppet/services/neutron-l3.yaml +++ b/puppet/services/neutron-l3.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' Debug: type: string default: '' diff --git a/puppet/services/neutron-metadata.yaml b/puppet/services/neutron-metadata.yaml index 1fe139f3..e221b3a1 100644 --- a/puppet/services/neutron-metadata.yaml +++ b/puppet/services/neutron-metadata.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' NeutronMetadataProxySharedSecret: description: Shared secret to prevent spoofing type: string diff --git a/puppet/services/pacemaker/glance-api.yaml b/puppet/services/pacemaker/glance-api.yaml index ad964216..5a581dca 100644 --- a/puppet/services/pacemaker/glance-api.yaml +++ b/puppet/services/pacemaker/glance-api.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' GlanceFilePcmkDevice: default: '' description: > @@ -43,7 +40,6 @@ resources: type: ../glance-api.yaml properties: EndpointMap: {get_param: EndpointMap} - MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri} outputs: role_data: diff --git a/puppet/services/pacemaker/glance-registry.yaml b/puppet/services/pacemaker/glance-registry.yaml index 393fbaaf..8b88cb93 100644 --- a/puppet/services/pacemaker/glance-registry.yaml +++ b/puppet/services/pacemaker/glance-registry.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' resources: @@ -19,7 +16,6 @@ resources: type: ../glance-registry.yaml properties: EndpointMap: {get_param: EndpointMap} - MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri} outputs: role_data: diff --git a/puppet/services/pacemaker/heat-api-cfn.yaml b/puppet/services/pacemaker/heat-api-cfn.yaml index ba620f89..5833c42d 100644 --- a/puppet/services/pacemaker/heat-api-cfn.yaml +++ b/puppet/services/pacemaker/heat-api-cfn.yaml @@ -9,16 +9,12 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' resources: HeatApiCfnBase: type: ../heat-api-cfn.yaml properties: EndpointMap: {get_param: EndpointMap} - MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri} outputs: role_data: diff --git a/puppet/services/pacemaker/heat-api-cloudwatch.yaml b/puppet/services/pacemaker/heat-api-cloudwatch.yaml index db71891c..8b67702c 100644 --- a/puppet/services/pacemaker/heat-api-cloudwatch.yaml +++ b/puppet/services/pacemaker/heat-api-cloudwatch.yaml @@ -9,16 +9,12 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' resources: HeatApiCloudwatchBase: type: ../heat-api-cloudwatch.yaml properties: EndpointMap: {get_param: EndpointMap} - MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri} outputs: role_data: diff --git a/puppet/services/pacemaker/heat-api.yaml b/puppet/services/pacemaker/heat-api.yaml index b1c37d41..6628e8dd 100644 --- a/puppet/services/pacemaker/heat-api.yaml +++ b/puppet/services/pacemaker/heat-api.yaml @@ -9,16 +9,12 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' resources: HeatApiBase: type: ../heat-api.yaml properties: EndpointMap: {get_param: EndpointMap} - MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri} outputs: role_data: diff --git a/puppet/services/pacemaker/heat-engine.yaml b/puppet/services/pacemaker/heat-engine.yaml index 1e39b363..e1195780 100644 --- a/puppet/services/pacemaker/heat-engine.yaml +++ b/puppet/services/pacemaker/heat-engine.yaml @@ -9,16 +9,12 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' resources: HeatEngineBase: type: ../heat-engine.yaml properties: EndpointMap: {get_param: EndpointMap} - MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri} outputs: diff --git a/puppet/services/pacemaker/keystone.yaml b/puppet/services/pacemaker/keystone.yaml index db52cae7..04e90368 100644 --- a/puppet/services/pacemaker/keystone.yaml +++ b/puppet/services/pacemaker/keystone.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' resources: @@ -19,7 +16,6 @@ resources: type: ../keystone.yaml properties: EndpointMap: {get_param: EndpointMap} - MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri} outputs: role_data: diff --git a/puppet/services/pacemaker/loadbalancer.yaml b/puppet/services/pacemaker/loadbalancer.yaml index 771b3d9b..be6825f6 100644 --- a/puppet/services/pacemaker/loadbalancer.yaml +++ b/puppet/services/pacemaker/loadbalancer.yaml @@ -9,16 +9,12 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' resources: LoadbalancerServiceBase: type: ../loadbalancer.yaml properties: EndpointMap: {get_param: EndpointMap} - MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri} outputs: role_data: diff --git a/puppet/services/pacemaker/memcached.yaml b/puppet/services/pacemaker/memcached.yaml index 306f805e..9a11855e 100644 --- a/puppet/services/pacemaker/memcached.yaml +++ b/puppet/services/pacemaker/memcached.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' resources: @@ -28,4 +25,3 @@ outputs: - memcached::service_manage: false step_config: | include ::tripleo::profile::pacemaker::memcached - diff --git a/puppet/services/pacemaker/neutron-dhcp.yaml b/puppet/services/pacemaker/neutron-dhcp.yaml index 0e972b28..6f514379 100644 --- a/puppet/services/pacemaker/neutron-dhcp.yaml +++ b/puppet/services/pacemaker/neutron-dhcp.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' resources: @@ -19,7 +16,6 @@ resources: type: ../neutron-dhcp.yaml properties: EndpointMap: {get_param: EndpointMap} - MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri} outputs: role_data: diff --git a/puppet/services/pacemaker/neutron-l3.yaml b/puppet/services/pacemaker/neutron-l3.yaml index 84bff808..73ea9d8d 100644 --- a/puppet/services/pacemaker/neutron-l3.yaml +++ b/puppet/services/pacemaker/neutron-l3.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' resources: @@ -19,7 +16,6 @@ resources: type: ../neutron-l3.yaml properties: EndpointMap: {get_param: EndpointMap} - MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri} outputs: role_data: diff --git a/puppet/services/pacemaker/neutron-metadata.yaml b/puppet/services/pacemaker/neutron-metadata.yaml index 79baf1ea..1c74b26f 100644 --- a/puppet/services/pacemaker/neutron-metadata.yaml +++ b/puppet/services/pacemaker/neutron-metadata.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' resources: @@ -19,7 +16,6 @@ resources: type: ../neutron-metadata.yaml properties: EndpointMap: {get_param: EndpointMap} - MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri} outputs: role_data: diff --git a/puppet/services/pacemaker/rabbitmq.yaml b/puppet/services/pacemaker/rabbitmq.yaml index 613db449..20fb2e40 100644 --- a/puppet/services/pacemaker/rabbitmq.yaml +++ b/puppet/services/pacemaker/rabbitmq.yaml @@ -9,16 +9,12 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' resources: RabbitMQServiceBase: type: ../rabbitmq.yaml properties: EndpointMap: {get_param: EndpointMap} - MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri} outputs: role_data: diff --git a/puppet/services/rabbitmq.yaml b/puppet/services/rabbitmq.yaml index ae5678a3..581b4ba4 100644 --- a/puppet/services/rabbitmq.yaml +++ b/puppet/services/rabbitmq.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' RabbitUserName: default: guest description: The username for RabbitMQ diff --git a/puppet/services/services.yaml b/puppet/services/services.yaml index f9681634..7ed880fc 100644 --- a/puppet/services/services.yaml +++ b/puppet/services/services.yaml @@ -15,10 +15,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - default: '' - type: string - description: The URI virtual IP for the MySQL service. resources: @@ -29,7 +25,6 @@ resources: concurrent: true resource_properties: EndpointMap: {get_param: EndpointMap} - MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri} outputs: config_settings: -- cgit 1.2.3-korg