Browse Source

Remove deprecated cloudwatch recipe

* Queens removed cloudwatch outright[0], which has been deprecated since
  Havana.

[0] http://lists.openstack.org/pipermail/openstack-dev/2017-October/123104.html

Change-Id: I4cd53d7aed179787d192d6342ec44fea9332fb66
Samuel Cassiba 1 year ago
parent
commit
5b2632d052

+ 0
- 3
README.md View File

@@ -52,9 +52,6 @@ openstack-common cookbook.
52 52
 Recipes
53 53
 =======
54 54
 
55
-## openstack-orchestration::api-cloudwatch
56
-- Configure and start heat-api-cloudwatch service
57
-
58 55
 ## openstack-orchestration::api-cfn
59 56
 - Configure and start heat-api-cfn service
60 57
 

+ 0
- 11
attributes/default.rb View File

@@ -28,18 +28,11 @@
28 28
   default['openstack']['endpoints'][ep_type]['orchestration-api-cfn']['scheme'] = 'http'
29 29
   default['openstack']['endpoints'][ep_type]['orchestration-api-cfn']['path'] = '/v1'
30 30
   default['openstack']['endpoints'][ep_type]['orchestration-api-cfn']['port'] = 8000
31
-  # openstack orchestration-api-cloudwatch service endpoints (used by users and services)
32
-  default['openstack']['endpoints'][ep_type]['orchestration-api-cloudwatch']['host'] = '127.0.0.1'
33
-  default['openstack']['endpoints'][ep_type]['orchestration-api-cloudwatch']['scheme'] = 'http'
34
-  default['openstack']['endpoints'][ep_type]['orchestration-api-cloudwatch']['path'] = '/v1'
35
-  default['openstack']['endpoints'][ep_type]['orchestration-api-cloudwatch']['port'] = 8003
36 31
 end
37 32
 default['openstack']['bind_service']['all']['orchestration-api']['host'] = '127.0.0.1'
38 33
 default['openstack']['bind_service']['all']['orchestration-api']['port'] = 8004
39 34
 default['openstack']['bind_service']['all']['orchestration-api-cfn']['host'] = '127.0.0.1'
40 35
 default['openstack']['bind_service']['all']['orchestration-api-cfn']['port'] = 8000
41
-default['openstack']['bind_service']['all']['orchestration-api-cloudwatch']['host'] = '127.0.0.1'
42
-default['openstack']['bind_service']['all']['orchestration-api-cloudwatch']['port'] = 8003
43 36
 
44 37
 # Set to some text value if you want templated config files
45 38
 # to contain a custom banner at the top of the written file
@@ -73,8 +66,6 @@ when 'rhel'
73 66
     'heat_api_service' => 'openstack-heat-api',
74 67
     'heat_api_cfn_packages' => ['openstack-heat-api-cfn'],
75 68
     'heat_api_cfn_service' => 'openstack-heat-api-cfn',
76
-    'heat_api_cloudwatch_packages' => ['openstack-heat-api-cloudwatch'],
77
-    'heat_api_cloudwatch_service' => 'openstack-heat-api-cloudwatch',
78 69
     'heat_engine_packages' => ['openstack-heat-engine'],
79 70
     'heat_engine_service' => 'openstack-heat-engine',
80 71
     'heat_api_process_name' => 'heat-api',
@@ -89,8 +80,6 @@ when 'debian'
89 80
     'heat_api_service' => 'heat-api',
90 81
     'heat_api_cfn_packages' => ['heat-api-cfn'],
91 82
     'heat_api_cfn_service' => 'heat-api-cfn',
92
-    'heat_api_cloudwatch_packages' => ['heat-api-cloudwatch'],
93
-    'heat_api_cloudwatch_service' => 'heat-api-cloudwatch',
94 83
     'heat_engine_packages' => ['heat-engine'],
95 84
     'heat_engine_service' => 'heat-engine',
96 85
     'package_overrides' => '',

+ 0
- 43
recipes/api-cloudwatch.rb View File

@@ -1,43 +0,0 @@
1
-# encoding: UTF-8
2
-#
3
-# Cookbook Name:: openstack-orchestration
4
-# Recipe:: api-cloudwatch
5
-#
6
-#
7
-# Cookbook Name:: openstack-orchestration
8
-# Recipe:: api-cloudwatch
9
-#
10
-# Copyright 2013, IBM Corp.
11
-#
12
-# Licensed under the Apache License, Version 2.0 (the "License");
13
-# you may not use this file except in compliance with the License.
14
-# You may obtain a copy of the License at
15
-#
16
-#     http://www.apache.org/licenses/LICENSE-2.0
17
-#
18
-# Unless required by applicable law or agreed to in writing, software
19
-# distributed under the License is distributed on an "AS IS" BASIS,
20
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
21
-# See the License for the specific language governing permissions and
22
-# limitations under the License.
23
-#
24
-
25
-include_recipe 'openstack-orchestration::common'
26
-
27
-platform_options = node['openstack']['orchestration']['platform']
28
-
29
-platform_options['heat_api_cloudwatch_packages'].each do |pkg|
30
-  package pkg do
31
-    options platform_options['package_overrides']
32
-
33
-    action :upgrade
34
-  end
35
-end
36
-
37
-service 'heat-api-cloudwatch' do
38
-  service_name platform_options['heat_api_cloudwatch_service']
39
-  supports status: true, restart: true
40
-
41
-  action :enable
42
-  subscribes :restart, 'template[/etc/heat/heat.conf]'
43
-end

+ 0
- 6
recipes/common.rb View File

@@ -59,8 +59,6 @@ bind_services = node['openstack']['bind_service']['all']
59 59
 api_bind = bind_services['orchestration-api']
60 60
 api_cfn_bind = bind_services['orchestration-api-cfn']
61 61
 api_cfn_endpoint = internal_endpoint 'orchestration-api-cfn'
62
-api_cw_bind = bind_services['orchestration-api-cloudwatch']
63
-api_cw_endpoint = internal_endpoint 'orchestration-api-cloudwatch'
64 62
 
65 63
 ec2_auth_uri = auth_uri_transform identity_endpoint.to_s, node['openstack']['orchestration']['ec2authtoken']['auth']['version']
66 64
 auth_uri = auth_uri_transform identity_endpoint.to_s, node['openstack']['orchestration']['api']['auth']['version']
@@ -68,13 +66,11 @@ base_auth_uri = identity_uri_transform auth_uri
68 66
 
69 67
 # We need these URIs without their default path
70 68
 metadata_uri = "#{api_cfn_endpoint.scheme}://#{api_cfn_endpoint.host}:#{api_cfn_endpoint.port}"
71
-watch_uri = "#{api_cw_endpoint.scheme}://#{api_cw_endpoint.host}:#{api_cw_endpoint.port}"
72 69
 
73 70
 # define attributes that are needed in the heat.conf
74 71
 node.default['openstack']['orchestration']['conf'].tap do |conf|
75 72
   conf['DEFAULT']['heat_metadata_server_url'] = metadata_uri
76 73
   conf['DEFAULT']['heat_waitcondition_server_url'] = "#{api_cfn_endpoint}/waitcondition"
77
-  conf['DEFAULT']['heat_watch_server_url'] = watch_uri
78 74
   conf['DEFAULT']['region_name_for_services'] = node['openstack']['region']
79 75
   conf['clients_keystone']['auth_uri'] = base_auth_uri
80 76
   conf['ec2authtoken']['auth_uri'] = ec2_auth_uri
@@ -82,8 +78,6 @@ node.default['openstack']['orchestration']['conf'].tap do |conf|
82 78
   conf['heat_api']['bind_port'] = api_bind['port']
83 79
   conf['heat_api_cfn']['bind_host'] = bind_address api_cfn_bind
84 80
   conf['heat_api_cfn']['bind_port'] = api_cfn_bind['port']
85
-  conf['heat_api_cloudwatch']['bind_host'] = bind_address api_cw_bind
86
-  conf['heat_api_cloudwatch']['bind_port'] = api_cw_bind['port']
87 81
   conf['keystone_authtoken']['auth_url'] = auth_uri
88 82
   conf['trustee']['auth_url'] = identity_admin_endpoint
89 83
 end

+ 0
- 3
recipes/identity_registration.rb View File

@@ -50,9 +50,6 @@ admin_project = node['openstack']['identity']['admin_project']
50 50
 admin_domain = node['openstack']['identity']['admin_domain_name']
51 51
 region = node['openstack']['region']
52 52
 
53
-# Do not configure a service/endpoint in keystone for heat-api-cloudwatch(Bug #1167927),
54
-# See discussions on https://bugs.launchpad.net/heat/+bug/1167927
55
-
56 53
 connection_params = {
57 54
   openstack_auth_url:     "#{auth_url}/auth/tokens",
58 55
   openstack_username:     admin_user,

+ 0
- 21
spec/api-cloudwatch-redhat_spec.rb View File

@@ -1,21 +0,0 @@
1
-# encoding: UTF-8
2
-require_relative 'spec_helper'
3
-
4
-describe 'openstack-orchestration::api-cloudwatch' do
5
-  describe 'redhat' do
6
-    let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
7
-    let(:node) { runner.node }
8
-    let(:chef_run) { runner.converge(described_recipe) }
9
-
10
-    include_context 'orchestration_stubs'
11
-    include_examples 'expect runs openstack orchestration common recipe'
12
-
13
-    it 'installs heat cloudwatch packages' do
14
-      expect(chef_run).to upgrade_package 'openstack-heat-api-cloudwatch'
15
-    end
16
-
17
-    it 'starts heat api-cloudwatch on boot' do
18
-      expect(chef_run).to enable_service('openstack-heat-api-cloudwatch')
19
-    end
20
-  end
21
-end

+ 0
- 10
spec/spec_helper.rb View File

@@ -126,7 +126,6 @@ shared_examples 'expects to create heat conf' do
126 126
         [
127 127
           %r{^heat_metadata_server_url = http://127.0.0.1:8000$},
128 128
           %r{^heat_waitcondition_server_url = http://127.0.0.1:8000/v1/waitcondition$},
129
-          %r{^heat_watch_server_url = http://127.0.0.1:8003$},
130 129
           %r{^log_dir = /var/log/heat$},
131 130
           /^region_name_for_services = RegionOne$/,
132 131
         ].each do |line|
@@ -160,15 +159,6 @@ shared_examples 'expects to create heat conf' do
160 159
         end
161 160
       end
162 161
 
163
-      it 'has heat_api_cloudwatch binding' do
164
-        [
165
-          /^bind_host = 127.0.0.1$/,
166
-          /^bind_port = 8003$/,
167
-        ].each do |line|
168
-          expect(chef_run).to render_config_file(file.name).with_section_content('heat_api_cloudwatch', line)
169
-        end
170
-      end
171
-
172 162
       it 'sets database connection value' do
173 163
         expect(chef_run).to render_config_file(file.name).with_section_content(
174 164
           'database', %r{^connection = mysql\+pymysql://heat:heat@127.0.0.1:3306/heat\?charset=utf8$}

+ 1
- 4
templates/default/default.yaml.erb View File

@@ -1,10 +1,7 @@
1
-<%= node["openstack"]["orchestration"]["custom_template_banner"] %>
1
+<%= node['openstack']['orchestration']['custom_template_banner'] %>
2 2
 
3 3
 resource_registry:
4 4
     # allow older templates with Quantum in them.
5 5
     "OS::Quantum*": "OS::Neutron*"
6
-    # Choose your implementation of AWS::CloudWatch::Alarm
7
-    #"AWS::CloudWatch::Alarm": "file:///etc/heat/templates/AWS_CloudWatch_Alarm.yaml"
8
-    "AWS::CloudWatch::Alarm": "OS::Heat::CWLiteAlarm"
9 6
     "OS::Metering::Alarm": "OS::Ceilometer::Alarm"
10 7
     "AWS::RDS::DBInstance": "file:///etc/heat/templates/AWS_RDS_DBInstance.yaml"

Loading…
Cancel
Save