From 2dfd0ea8cafba2f29593f348bc1d64aa6dfa3169 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Tue, 16 Oct 2018 16:18:27 -0600 Subject: [PATCH] Flatten Aodh service configuration This change combines the previous puppet and docker files into a single file that performs the docker service installation and configuration. With this patch the baremetal version of aodh services have been removed. Co-Authored-By: Juan Antonio Osorio Robles Depends-On: https://review.rdoproject.org/r/#/c/16994/ Change-Id: I39645aff0365218d4b841ed0d9c964b3622f143a Related-Blueprint: services-yaml-flattening --- .../aodh/aodh-api-container.yaml | 90 ++++++++++-- .../aodh}/aodh-base.yaml | 0 .../aodh/aodh-evaluator-container.yaml | 21 +-- .../aodh/aodh-listener-container.yaml | 24 ++-- .../aodh/aodh-notifier-container.yaml | 24 ++-- environments/baremetal-services.yaml | 8 +- .../services-baremetal/undercloud-aodh.yaml | 5 - environments/services/undercloud-aodh.yaml | 7 - overcloud-resource-registry-puppet.j2.yaml | 8 +- puppet/services/aodh-api.yaml | 129 ------------------ puppet/services/aodh-evaluator.yaml | 74 ---------- puppet/services/aodh-listener.yaml | 74 ---------- puppet/services/aodh-notifier.yaml | 74 ---------- .../drop-baremetal-aodh-22cb1dfc59204427.yaml | 4 + 14 files changed, 127 insertions(+), 415 deletions(-) rename docker/services/aodh-api.yaml => deployment/aodh/aodh-api-container.yaml (74%) rename {puppet/services => deployment/aodh}/aodh-base.yaml (100%) rename docker/services/aodh-evaluator.yaml => deployment/aodh/aodh-evaluator-container.yaml (92%) rename docker/services/aodh-listener.yaml => deployment/aodh/aodh-listener-container.yaml (90%) rename docker/services/aodh-notifier.yaml => deployment/aodh/aodh-notifier-container.yaml (90%) delete mode 100644 environments/services-baremetal/undercloud-aodh.yaml delete mode 100644 environments/services/undercloud-aodh.yaml delete mode 100644 puppet/services/aodh-api.yaml delete mode 100644 puppet/services/aodh-evaluator.yaml delete mode 100644 puppet/services/aodh-listener.yaml delete mode 100644 puppet/services/aodh-notifier.yaml create mode 100644 releasenotes/notes/drop-baremetal-aodh-22cb1dfc59204427.yaml diff --git a/docker/services/aodh-api.yaml b/deployment/aodh/aodh-api-container.yaml similarity index 74% rename from docker/services/aodh-api.yaml rename to deployment/aodh/aodh-api-container.yaml index a56eab65d6..31e1f7e8b8 100644 --- a/docker/services/aodh-api.yaml +++ b/deployment/aodh/aodh-api-container.yaml @@ -39,6 +39,19 @@ parameters: EnableInternalTLS: type: boolean default: false + GnocchiExternalProject: + default: 'service' + description: Project name of resources creator in Gnocchi. + type: string + MonitoringSubscriptionAodhApi: + default: 'overcloud-ceilometer-aodh-api' + type: string + AodhApiPolicies: + description: | + A hash of policies to configure for Aodh API. + e.g. { aodh-context_is_admin: { key: context_is_admin, value: 'role:admin' } } + default: {} + type: json UpgradeRemoveUnusedPackages: default: false description: Remove package if the service is being disabled during upgrade @@ -51,31 +64,78 @@ conditions: resources: ContainersCommon: - type: ./containers-common.yaml + type: ../../docker/services/containers-common.yaml MySQLClient: type: ../../puppet/services/database/mysql-client.yaml - AodhApiPuppetBase: - type: ../../puppet/services/aodh-api.yaml - properties: - EndpointMap: {get_param: EndpointMap} - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} + AodhBase: + type: ./aodh-base.yaml + properties: + ServiceData: {get_param: ServiceData} + ServiceNetMap: {get_param: ServiceNetMap} + DefaultPasswords: {get_param: DefaultPasswords} + EndpointMap: {get_param: EndpointMap} + RoleName: {get_param: RoleName} + RoleParameters: {get_param: RoleParameters} + + ApacheServiceBase: + type: ../../puppet/services/apache.yaml + properties: + ServiceData: {get_param: ServiceData} + ServiceNetMap: {get_param: ServiceNetMap} + DefaultPasswords: {get_param: DefaultPasswords} + EndpointMap: {get_param: EndpointMap} + RoleName: {get_param: RoleName} + RoleParameters: {get_param: RoleParameters} + EnableInternalTLS: {get_param: EnableInternalTLS} outputs: role_data: description: Role data for the aodh API role. value: - service_name: {get_attr: [AodhApiPuppetBase, role_data, service_name]} + service_name: aodh_api config_settings: map_merge: - - get_attr: [AodhApiPuppetBase, role_data, config_settings] + - get_attr: [AodhBase, role_data, config_settings] + - get_attr: [ApacheServiceBase, role_data, config_settings] - apache::default_vhost: false - service_config_settings: {get_attr: [AodhApiPuppetBase, role_data, service_config_settings]} + aodh::wsgi::apache::ssl: {get_param: EnableInternalTLS} + aodh::wsgi::apache::servername: + str_replace: + template: + "%{hiera('fqdn_$NETWORK')}" + params: + $NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]} + aodh::wsgi::apache::wsgi_process_display_name: 'aodh_wsgi' + aodh::api::service_name: 'httpd' + aodh::api::enable_proxy_headers_parsing: true + aodh::api::gnocchi_external_project_owner: {get_param: GnocchiExternalProject} + aodh::policy::policies: {get_param: AodhApiPolicies} + tripleo::aodh_api::firewall_rules: + '128 aodh-api': + dport: + - 8042 + - 13042 + aodh::api::host: + str_replace: + template: + "%{hiera('fqdn_$NETWORK')}" + params: + $NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]} + # NOTE: bind IP is found in hiera replacing the network name with the + # local node IP for the given network; replacement examples + # (eg. for internal_api): + # internal_api -> IP + # internal_api_uri -> [IP] + # internal_api_subnet - > IP/CIDR + aodh::wsgi::apache::bind_host: + str_replace: + template: + "%{hiera('$NETWORK')}" + params: + $NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]} + service_config_settings: {get_attr: [AodhBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS puppet_config: config_volume: aodh @@ -83,7 +143,7 @@ outputs: step_config: list_join: - "\n" - - - {get_attr: [AodhApiPuppetBase, role_data, step_config]} + - - "include tripleo::profile::base::aodh::api" - {get_attr: [MySQLClient, role_data, step_config]} config_image: {get_param: DockerAodhConfigImage} kolla_config: @@ -211,7 +271,7 @@ outputs: ignore_errors: True when: remove_aodh_api_package|bool metadata_settings: - get_attr: [AodhApiPuppetBase, role_data, metadata_settings] + get_attr: [ApacheServiceBase, role_data, metadata_settings] post_upgrade_tasks: - when: step|int == 1 import_role: diff --git a/puppet/services/aodh-base.yaml b/deployment/aodh/aodh-base.yaml similarity index 100% rename from puppet/services/aodh-base.yaml rename to deployment/aodh/aodh-base.yaml diff --git a/docker/services/aodh-evaluator.yaml b/deployment/aodh/aodh-evaluator-container.yaml similarity index 92% rename from docker/services/aodh-evaluator.yaml rename to deployment/aodh/aodh-evaluator-container.yaml index ce7436d252..b20a27c320 100644 --- a/docker/services/aodh-evaluator.yaml +++ b/deployment/aodh/aodh-evaluator-container.yaml @@ -40,22 +40,25 @@ parameters: default: false description: Remove package if the service is being disabled during upgrade type: boolean + MonitoringSubscriptionAodhEvaluator: + default: 'overcloud-ceilometer-aodh-evaluator' + type: string resources: ContainersCommon: - type: ./containers-common.yaml + type: ../../docker/services/containers-common.yaml MySQLClient: type: ../../puppet/services/database/mysql-client.yaml - AodhEvaluatorBase: - type: ../../puppet/services/aodh-evaluator.yaml + AodhBase: + type: ./aodh-base.yaml properties: - EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} DefaultPasswords: {get_param: DefaultPasswords} + EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -63,11 +66,11 @@ outputs: role_data: description: Role data for the Aodh API role. value: - service_name: {get_attr: [AodhEvaluatorBase, role_data, service_name]} + service_name: aodh_evaluator + monitoring_subscription: {get_param: MonitoringSubscriptionAodhEvaluator} config_settings: - map_merge: - - get_attr: [AodhEvaluatorBase, role_data, config_settings] - service_config_settings: {get_attr: [AodhEvaluatorBase, role_data, service_config_settings]} + get_attr: [AodhBase, role_data, config_settings] + service_config_settings: {get_attr: [AodhBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS puppet_config: config_volume: aodh @@ -75,7 +78,7 @@ outputs: step_config: list_join: - "\n" - - - {get_attr: [AodhEvaluatorBase, role_data, step_config]} + - - "include tripleo::profile::base::aodh::evaluator" - {get_attr: [MySQLClient, role_data, step_config]} config_image: {get_param: DockerAodhConfigImage} kolla_config: diff --git a/docker/services/aodh-listener.yaml b/deployment/aodh/aodh-listener-container.yaml similarity index 90% rename from docker/services/aodh-listener.yaml rename to deployment/aodh/aodh-listener-container.yaml index 51adb1a655..21ab6eff94 100644 --- a/docker/services/aodh-listener.yaml +++ b/deployment/aodh/aodh-listener-container.yaml @@ -40,22 +40,25 @@ parameters: default: false description: Remove package if the service is being disabled during upgrade type: boolean + MonitoringSubscriptionAodhListener: + default: 'overcloud-ceilometer-aodh-listener' + type: string resources: ContainersCommon: - type: ./containers-common.yaml + type: ../../docker/services/containers-common.yaml MySQLClient: type: ../../puppet/services/database/mysql-client.yaml - AodhListenerBase: - type: ../../puppet/services/aodh-listener.yaml + AodhBase: + type: ./aodh-base.yaml properties: - EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} DefaultPasswords: {get_param: DefaultPasswords} + EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -63,11 +66,12 @@ outputs: role_data: description: Role data for the Aodh API role. value: - service_name: {get_attr: [AodhListenerBase, role_data, service_name]} + service_name: aodh_listener + monitoring_subscription: {get_param: MonitoringSubscriptionAodhListener} config_settings: - map_merge: - - get_attr: [AodhListenerBase, role_data, config_settings] - service_config_settings: {get_attr: [AodhListenerBase, role_data, service_config_settings]} + get_attr: [AodhBase, role_data, config_settings] + service_config_settings: + get_attr: [AodhBase, role_data, service_config_settings] # BEGIN DOCKER SETTINGS puppet_config: config_volume: aodh @@ -75,7 +79,7 @@ outputs: step_config: list_join: - "\n" - - - {get_attr: [AodhListenerBase, role_data, step_config]} + - - "include tripleo::profile::base::aodh::listener" - {get_attr: [MySQLClient, role_data, step_config]} config_image: {get_param: DockerAodhConfigImage} kolla_config: @@ -105,7 +109,7 @@ outputs: - yaql: expression: str($.data.port) data: - port: {get_attr: [AodhListenerBase, role_data, config_settings, 'aodh::rabbit_port']} + port: {get_attr: [AodhBase, role_data, config_settings, 'aodh::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/aodh-notifier.yaml b/deployment/aodh/aodh-notifier-container.yaml similarity index 90% rename from docker/services/aodh-notifier.yaml rename to deployment/aodh/aodh-notifier-container.yaml index fb42d38b5a..bbfebaaf93 100644 --- a/docker/services/aodh-notifier.yaml +++ b/deployment/aodh/aodh-notifier-container.yaml @@ -40,22 +40,25 @@ parameters: default: false description: Remove package if the service is being disabled during upgrade type: boolean + MonitoringSubscriptionAodhNotifier: + default: 'overcloud-ceilometer-aodh-notifier' + type: string resources: ContainersCommon: - type: ./containers-common.yaml + type: ../../docker/services/containers-common.yaml MySQLClient: type: ../../puppet/services/database/mysql-client.yaml - AodhNotifierBase: - type: ../../puppet/services/aodh-notifier.yaml + AodhBase: + type: ./aodh-base.yaml properties: - EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} DefaultPasswords: {get_param: DefaultPasswords} + EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} @@ -63,11 +66,12 @@ outputs: role_data: description: Role data for the Aodh API role. value: - service_name: {get_attr: [AodhNotifierBase, role_data, service_name]} + service_name: aodh_notifier + monitoring_subscription: {get_param: MonitoringSubscriptionAodhNotifier} config_settings: - map_merge: - - get_attr: [AodhNotifierBase, role_data, config_settings] - service_config_settings: {get_attr: [AodhNotifierBase, role_data, service_config_settings]} + get_attr: [AodhBase, role_data, config_settings] + service_config_settings: + get_attr: [AodhBase, role_data, service_config_settings] # BEGIN DOCKER SETTINGS puppet_config: config_volume: aodh @@ -75,7 +79,7 @@ outputs: step_config: list_join: - "\n" - - - {get_attr: [AodhNotifierBase, role_data, step_config]} + - - "include tripleo::profile::base::aodh::notifier" - {get_attr: [MySQLClient, role_data, step_config]} config_image: {get_param: DockerAodhConfigImage} kolla_config: @@ -105,7 +109,7 @@ outputs: - yaql: expression: str($.data.port) data: - port: {get_attr: [AodhNotifierBase, role_data, config_settings, 'aodh::rabbit_port']} + port: {get_attr: [AodhBase, role_data, config_settings, 'aodh::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/environments/baremetal-services.yaml b/environments/baremetal-services.yaml index f708b01293..05ff6d17c7 100644 --- a/environments/baremetal-services.yaml +++ b/environments/baremetal-services.yaml @@ -2,10 +2,10 @@ resource_registry: OS::TripleO::Services::Docker: OS::Heat::None OS::TripleO::Docker::NeutronMl2PluginBase: OS::Heat::None - OS::TripleO::Services::AodhApi: ../puppet/services/aodh-api.yaml - OS::TripleO::Services::AodhEvaluator: ../puppet/services/aodh-evaluator.yaml - OS::TripleO::Services::AodhNotifier: ../puppet/services/aodh-notifier.yaml - OS::TripleO::Services::AodhListener: ../puppet/services/aodh-listener.yaml + OS::TripleO::Services::AodhApi: ../deployment/aodh/aodh-api-container.yaml + OS::TripleO::Services::AodhEvaluator: ../deployment/aodh/aodh-evaluator-container.yaml + OS::TripleO::Services::AodhNotifier: ../deployment/aodh/aodh-notifier-container.yaml + OS::TripleO::Services::AodhListener: ../deployment/aodh/aodh-listener-container.yaml OS::TripleO::Services::BlockStorageCinderVolume: ../puppet/services/cinder-volume.yaml OS::TripleO::Services::CeilometerAgentCentral: ../puppet/services/ceilometer-agent-central.yaml OS::TripleO::Services::CeilometerAgentIpmi: ../puppet/services/ceilometer-agent-ipmi.yaml diff --git a/environments/services-baremetal/undercloud-aodh.yaml b/environments/services-baremetal/undercloud-aodh.yaml deleted file mode 100644 index e86dee15e6..0000000000 --- a/environments/services-baremetal/undercloud-aodh.yaml +++ /dev/null @@ -1,5 +0,0 @@ -resource_registry: - OS::TripleO::Services::UndercloudAodhApi: ../../puppet/services/aodh-api.yaml - OS::TripleO::Services::UndercloudAodhEvaluator: ../../puppet/services/aodh-evaluator.yaml - OS::TripleO::Services::UndercloudAodhNotifier: ../../puppet/services/aodh-notifier.yaml - OS::TripleO::Services::UndercloudAodhListener: ../../puppet/services/aodh-listener.yaml diff --git a/environments/services/undercloud-aodh.yaml b/environments/services/undercloud-aodh.yaml deleted file mode 100644 index 00ca8f4f05..0000000000 --- a/environments/services/undercloud-aodh.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# DEPRECATED. This file will be removed in the Stein release as it is no longer -# needed -resource_registry: - OS::TripleO::Services::AodhApi: ../../docker/services/aodh-api.yaml - OS::TripleO::Services::AodhEvaluator: ../../docker/services/aodh-evaluator.yaml - OS::TripleO::Services::AodhNotifier: ../../docker/services/aodh-notifier.yaml - OS::TripleO::Services::AodhListener: ../../docker/services/aodh-listener.yaml diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 99bd7e6bf9..46022ef6e2 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -261,10 +261,10 @@ resource_registry: OS::TripleO::Services::BarbicanBackendDogtag: OS::Heat::None OS::TripleO::Services::BarbicanBackendKmip: OS::Heat::None OS::TripleO::Services::BarbicanBackendPkcs11Crypto: OS::Heat::None - OS::TripleO::Services::AodhApi: docker/services/aodh-api.yaml - OS::TripleO::Services::AodhEvaluator: docker/services/aodh-evaluator.yaml - OS::TripleO::Services::AodhListener: docker/services/aodh-listener.yaml - OS::TripleO::Services::AodhNotifier: docker/services/aodh-notifier.yaml + OS::TripleO::Services::AodhApi: deployment/aodh/aodh-api-container.yaml + OS::TripleO::Services::AodhEvaluator: deployment/aodh/aodh-evaluator-container.yaml + OS::TripleO::Services::AodhListener: deployment/aodh/aodh-listener-container.yaml + OS::TripleO::Services::AodhNotifier: deployment/aodh/aodh-notifier-container.yaml OS::TripleO::Services::PankoApi: docker/services/panko-api.yaml OS::TripleO::Services::MetricsQdr: OS::Heat::None OS::TripleO::Services::MistralEngine: OS::Heat::None diff --git a/puppet/services/aodh-api.yaml b/puppet/services/aodh-api.yaml deleted file mode 100644 index 92dfae9b65..0000000000 --- a/puppet/services/aodh-api.yaml +++ /dev/null @@ -1,129 +0,0 @@ -heat_template_version: rocky - -description: > - OpenStack Aodh API service configured with Puppet - -parameters: - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. This - mapping overrides those in ServiceNetMapDefaults. - type: json - DefaultPasswords: - default: {} - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - GnocchiExternalProject: - default: 'service' - description: Project name of resources creator in Gnocchi. - type: string - MonitoringSubscriptionAodhApi: - default: 'overcloud-ceilometer-aodh-api' - type: string - EnableInternalTLS: - type: boolean - default: false - AodhApiPolicies: - description: | - A hash of policies to configure for Aodh API. - e.g. { aodh-context_is_admin: { key: context_is_admin, value: 'role:admin' } } - default: {} - type: json - -resources: - AodhBase: - type: ./aodh-base.yaml - properties: - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} - EndpointMap: {get_param: EndpointMap} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} - - ApacheServiceBase: - type: ./apache.yaml - properties: - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} - EndpointMap: {get_param: EndpointMap} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} - EnableInternalTLS: {get_param: EnableInternalTLS} - -outputs: - role_data: - description: Role data for the Aodh API service. - value: - service_name: aodh_api - monitoring_subscription: {get_param: MonitoringSubscriptionAodhApi} - config_settings: - map_merge: - - get_attr: [AodhBase, role_data, config_settings] - - get_attr: [ApacheServiceBase, role_data, config_settings] - - aodh::wsgi::apache::ssl: {get_param: EnableInternalTLS} - aodh::wsgi::apache::servername: - str_replace: - template: - "%{hiera('fqdn_$NETWORK')}" - params: - $NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]} - aodh::wsgi::apache::wsgi_process_display_name: 'aodh_wsgi' - aodh::api::service_name: 'httpd' - aodh::api::enable_proxy_headers_parsing: true - aodh::api::gnocchi_external_project_owner: {get_param: GnocchiExternalProject} - aodh::policy::policies: {get_param: AodhApiPolicies} - tripleo::aodh_api::firewall_rules: - '128 aodh-api': - dport: - - 8042 - - 13042 - aodh::api::host: - str_replace: - template: - "%{hiera('fqdn_$NETWORK')}" - params: - $NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]} - # NOTE: bind IP is found in hiera replacing the network name with the - # local node IP for the given network; replacement examples - # (eg. for internal_api): - # internal_api -> IP - # internal_api_uri -> [IP] - # internal_api_subnet - > IP/CIDR - aodh::wsgi::apache::bind_host: - str_replace: - template: - "%{hiera('$NETWORK')}" - params: - $NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]} - service_config_settings: - get_attr: [AodhBase, role_data, service_config_settings] - step_config: | - include tripleo::profile::base::aodh::api - metadata_settings: - get_attr: [ApacheServiceBase, role_data, metadata_settings] - upgrade_tasks: - list_concat: - - get_attr: [ApacheServiceBase, role_data, upgrade_tasks] - - - - name: Stop aodh_api service (running under httpd) - when: step|int == 1 - service: name=httpd state=stopped diff --git a/puppet/services/aodh-evaluator.yaml b/puppet/services/aodh-evaluator.yaml deleted file mode 100644 index 83442382b1..0000000000 --- a/puppet/services/aodh-evaluator.yaml +++ /dev/null @@ -1,74 +0,0 @@ -heat_template_version: rocky - -description: > - OpenStack Aodh Evaluator service configured with Puppet - -parameters: - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. This - mapping overrides those in ServiceNetMapDefaults. - type: json - DefaultPasswords: - default: {} - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - MonitoringSubscriptionAodhEvaluator: - default: 'overcloud-ceilometer-aodh-evaluator' - type: string - -resources: - AodhBase: - type: ./aodh-base.yaml - properties: - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} - EndpointMap: {get_param: EndpointMap} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} - -outputs: - role_data: - description: Role data for the Aodh Evaluator service. - value: - service_name: aodh_evaluator - monitoring_subscription: {get_param: MonitoringSubscriptionAodhEvaluator} - config_settings: - get_attr: [AodhBase, role_data, config_settings] - step_config: | - include tripleo::profile::base::aodh::evaluator - upgrade_tasks: - - name: Check if aodh_evaluator is deployed - command: systemctl is-enabled openstack-aodh-evaluator - tags: common - ignore_errors: True - register: aodh_evaluator_enabled - - name: "PreUpgrade step0,validation: Check service openstack-aodh-evaluator is running" - shell: /usr/bin/systemctl show 'openstack-aodh-evaluator' --property ActiveState | grep '\bactive\b' - when: - - step|int == 0 - - aodh_evaluator_enabled.rc == 0 - tags: validation - - name: Stop aodh_evaluator service - when: - - step|int == 1 - - aodh_evaluator_enabled.rc == 0 - service: name=openstack-aodh-evaluator state=stopped diff --git a/puppet/services/aodh-listener.yaml b/puppet/services/aodh-listener.yaml deleted file mode 100644 index e9e428f06b..0000000000 --- a/puppet/services/aodh-listener.yaml +++ /dev/null @@ -1,74 +0,0 @@ -heat_template_version: rocky - -description: > - OpenStack Aodh Listener service configured with Puppet - -parameters: - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. This - mapping overrides those in ServiceNetMapDefaults. - type: json - DefaultPasswords: - default: {} - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - MonitoringSubscriptionAodhListener: - default: 'overcloud-ceilometer-aodh-listener' - type: string - -resources: - AodhBase: - type: ./aodh-base.yaml - properties: - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} - EndpointMap: {get_param: EndpointMap} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} - -outputs: - role_data: - description: Role data for the Aodh Listener service. - value: - service_name: aodh_listener - monitoring_subscription: {get_param: MonitoringSubscriptionAodhListener} - config_settings: - get_attr: [AodhBase, role_data, config_settings] - step_config: | - include tripleo::profile::base::aodh::listener - upgrade_tasks: - - name: Check if aodh_listener is deployed - command: systemctl is-enabled openstack-aodh-listener - tags: common - ignore_errors: True - register: aodh_listener_enabled - - name: "PreUpgrade step0,validation: Check service openstack-aodh-listener is running" - shell: /usr/bin/systemctl show 'openstack-aodh-listener' --property ActiveState | grep '\bactive\b' - when: - - step|int == 0 - - aodh_listener_enabled.rc == 0 - tags: validation - - name: Stop aodh_listener service - when: - - step|int == 1 - - aodh_listener_enabled.rc == 0 - service: name=openstack-aodh-listener state=stopped diff --git a/puppet/services/aodh-notifier.yaml b/puppet/services/aodh-notifier.yaml deleted file mode 100644 index 4e824123bd..0000000000 --- a/puppet/services/aodh-notifier.yaml +++ /dev/null @@ -1,74 +0,0 @@ -heat_template_version: rocky - -description: > - OpenStack Aodh Notifier service configured with Puppet - -parameters: - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. This - mapping overrides those in ServiceNetMapDefaults. - type: json - DefaultPasswords: - default: {} - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - MonitoringSubscriptionAodhNotifier: - default: 'overcloud-ceilometer-aodh-notifier' - type: string - -resources: - AodhBase: - type: ./aodh-base.yaml - properties: - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} - EndpointMap: {get_param: EndpointMap} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} - -outputs: - role_data: - description: Role data for the Aodh Notifier service. - value: - service_name: aodh_notifier - monitoring_subscription: {get_param: MonitoringSubscriptionAodhNotifier} - config_settings: - get_attr: [AodhBase, role_data, config_settings] - step_config: | - include tripleo::profile::base::aodh::notifier - upgrade_tasks: - - name: Check if aodh_notifier is deployed - command: systemctl is-enabled openstack-aodh-notifier - tags: common - ignore_errors: True - register: aodh_notifier_enabled - - name: "PreUpgrade step0,validation: Check service openstack-aodh-notifier is running" - shell: /usr/bin/systemctl show 'openstack-aodh-notifier' --property ActiveState | grep '\bactive\b' - when: - - step|int == 0 - - aodh_notifier_enabled.rc == 0 - tags: validation - - name: Stop aodh_notifier service - when: - - step|int == 1 - - aodh_notifier_enabled.rc == 0 - service: name=openstack-aodh-notifier state=stopped diff --git a/releasenotes/notes/drop-baremetal-aodh-22cb1dfc59204427.yaml b/releasenotes/notes/drop-baremetal-aodh-22cb1dfc59204427.yaml new file mode 100644 index 0000000000..d5d9513d2d --- /dev/null +++ b/releasenotes/notes/drop-baremetal-aodh-22cb1dfc59204427.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Installing Aodh services on baremetal is no longer supported.