From 5a1297b02bfe51dd7707dce39eaf40b78f80f28e Mon Sep 17 00:00:00 2001 From: marios Date: Fri, 6 Oct 2017 15:47:32 +0300 Subject: Remove Heat Cloudwatch API during upgrade and disable by default This adds a heat-api-cloudwatch-disabled.yaml and wires it up in the resource registry. During the Ocata to Pike upgrade this service will thus be stopped and disabled by default. If you wish to keep the Heat Cloudwatch API then you should instead use the provided heat-api-cloudwatch.yaml environment file. Change-Id: I3f90a9799b90ca365f675f593371c1d3701fede6 Related-Bug: 1713531 (cherry picked from commit 4d21451666f2dd7a8935da3a7166a9afc2ccd6bd) --- environments/services/heat-api-cloudwatch.yaml | 2 + overcloud-resource-registry-puppet.j2.yaml | 2 +- .../disabled/heat-api-cloudwatch-disabled.yaml | 48 ++++++++++++++++++++++ ...sable-heat-api-cloudwatch-d5a471da22472bde.yaml | 15 +++++++ 4 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 environments/services/heat-api-cloudwatch.yaml create mode 100644 puppet/services/disabled/heat-api-cloudwatch-disabled.yaml create mode 100644 releasenotes/notes/disable-heat-api-cloudwatch-d5a471da22472bde.yaml diff --git a/environments/services/heat-api-cloudwatch.yaml b/environments/services/heat-api-cloudwatch.yaml new file mode 100644 index 00000000..ce22a91c --- /dev/null +++ b/environments/services/heat-api-cloudwatch.yaml @@ -0,0 +1,2 @@ +resource_registry: + OS::TripleO::Services::HeatApiCloudwatch: ../../puppet/services/heat-api-cloudwatch.yaml diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index e402f125..3ee77218 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -133,7 +133,7 @@ resource_registry: OS::TripleO::Services::GlanceRegistry: puppet/services/disabled/glance-registry-disabled.yaml OS::TripleO::Services::HeatApi: puppet/services/heat-api.yaml OS::TripleO::Services::HeatApiCfn: puppet/services/heat-api-cfn.yaml - OS::TripleO::Services::HeatApiCloudwatch: puppet/services/heat-api-cloudwatch.yaml + OS::TripleO::Services::HeatApiCloudwatch: puppet/services/disabled/heat-api-cloudwatch-disabled.yaml OS::TripleO::Services::HeatEngine: puppet/services/heat-engine.yaml OS::TripleO::Services::Kernel: puppet/services/kernel.yaml OS::TripleO::Services::MySQL: puppet/services/database/mysql.yaml diff --git a/puppet/services/disabled/heat-api-cloudwatch-disabled.yaml b/puppet/services/disabled/heat-api-cloudwatch-disabled.yaml new file mode 100644 index 00000000..f7935712 --- /dev/null +++ b/puppet/services/disabled/heat-api-cloudwatch-disabled.yaml @@ -0,0 +1,48 @@ +heat_template_version: pike + +description: > + Openstack Heat CloudWatch API service, disabled by default since Pike + +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 + +outputs: + role_data: + description: Role data for the disabled Heat CloudWatch API + value: + service_name: heat_api_cloudwatch_disabled + upgrade_tasks: + - name: Check if heat_api_cloudwatch is deployed + command: systemctl is-enabled openstack-heat-api-cloudwatch + tags: step1 + ignore_errors: True + register: heat_api_cloudwatch_enabled + - name: Stop and disable heat_api_cloudwatch service (pre-upgrade not under httpd) + tags: step1 + when: heat_api_cloudwatch_enabled.rc == 0 + service: name=openstack-heat-api-cloudwatch state=stopped enabled=no diff --git a/releasenotes/notes/disable-heat-api-cloudwatch-d5a471da22472bde.yaml b/releasenotes/notes/disable-heat-api-cloudwatch-d5a471da22472bde.yaml new file mode 100644 index 00000000..5c732c01 --- /dev/null +++ b/releasenotes/notes/disable-heat-api-cloudwatch-d5a471da22472bde.yaml @@ -0,0 +1,15 @@ +--- +upgrade: + - | + The Heat API Cloudwatch API is deprecated in Pike and so it removed + by default during the Ocata to Pike upgrade. If you wish to keep this + service then you should use the environments/heat-api-cloudwatch.yaml + environment file in the tripleo-heat-templates during the upgrade (note + that this is migrated to running under httpd, if you do decide to keep + this service on Pike). +deprecations: + - | + The Heat API Cloudwatch API is deprecated in Pike and so it is now not + deployed by default. You can override this behaviour with the + environments/heat-api-cloudwatch.yaml environment file in the + tripleo-heat-templates. -- cgit 1.2.3-korg