Remove CloudWatch API
It has been removed upstream, so we follow the trend. Change-Id: Ic377c5dc8e4941b1a96516c99dcf8166cfe688f0
This commit is contained in:
Jean-Philippe Evrard
parent
172b4ddfec
commit
294df3bb56
|
|
@ -16,5 +16,4 @@ Ansible role to install OpenStack Heat.
|
|||
This role will install:
|
||||
* heat-api
|
||||
* heat-api-cfn
|
||||
* heat-api-cloudwatch
|
||||
* heat-engine
|
||||
|
|
|
|||
|
|
@ -155,13 +155,6 @@ heat_waitcondition_server_uri: "{{ heat_cfn_service_publicuri_proto }}://{{ exte
|
|||
heat_waitcondition_server_url: "{{ heat_waitcondition_server_uri }}/v1/waitcondition"
|
||||
heat_metadata_server_url: "{{ heat_cfn_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ heat_cfn_service_port }}"
|
||||
|
||||
## Heat watch server
|
||||
heat_watch_proto: http
|
||||
heat_watch_port: 8003
|
||||
heat_watch_publicuri_proto: "{{ openstack_service_publicuri_proto | default(heat_watch_proto) }}"
|
||||
heat_watch_server_uri: "{{ heat_watch_publicuri_proto }}://{{ external_lb_vip_address }}:{{ heat_watch_port }}"
|
||||
heat_watch_server_url: "{{ heat_watch_server_uri }}"
|
||||
|
||||
# If the following variables are unset in user_variables, the value set will be half the number of available VCPUs
|
||||
# heat_engine_workers: 4
|
||||
# heat_api_workers: 4
|
||||
|
|
@ -211,7 +204,6 @@ heat_pip_packages:
|
|||
|
||||
heat_api_init_overrides: {}
|
||||
heat_api_cfn_init_overrides: {}
|
||||
heat_api_cloudwatch_init_overrides: {}
|
||||
heat_engine_init_overrides: {}
|
||||
|
||||
## Service Name-Group Mapping
|
||||
|
|
@ -240,18 +232,6 @@ heat_services:
|
|||
uwsgi_port: "{{ heat_cfn_service_port }}"
|
||||
uwsgi_bind_address: "{{ heat_api_cfn_uwsgi_bind_address }}"
|
||||
program_override: "{{ heat_bin }}/uwsgi --ini /etc/uwsgi/heat-api-cfn.ini"
|
||||
heat-api-cloudwatch:
|
||||
group: heat_api_cloudwatch
|
||||
service_name: heat-api-cloudwatch
|
||||
init_config_overrides: "{{ heat_api_cloudwatch_init_overrides }}"
|
||||
start_order: 3
|
||||
wsgi_overrides: "{{ heat_api_cloudwatch_uwsgi_ini_overrides }}"
|
||||
wsgi_app: True
|
||||
log_string: "--logto "
|
||||
wsgi_name: heat-wsgi-api-cloudwatch
|
||||
uwsgi_port: "{{ heat_watch_port }}"
|
||||
uwsgi_bind_address: "{{ heat_api_cloudwatch_uwsgi_bind_address }}"
|
||||
program_override: "{{ heat_bin }}/uwsgi --ini /etc/uwsgi/heat-api-cloudwatch.ini"
|
||||
heat-engine:
|
||||
group: heat_engine
|
||||
service_name: heat-engine
|
||||
|
|
@ -271,14 +251,12 @@ heat_required_secrets:
|
|||
# uWSGI Settings
|
||||
heat_api_uwsgi_ini_overrides: {}
|
||||
heat_api_cfn_uwsgi_ini_overrides: {}
|
||||
heat_api_cloudwatch_uwsgi_ini_overrides: {}
|
||||
heat_wsgi_processes_max: 16
|
||||
heat_wsgi_processes: "{{ [[ansible_processor_vcpus|default(1), 1] | max * 2, heat_wsgi_processes_max] | min }}"
|
||||
heat_wsgi_threads: 1
|
||||
heat_wsgi_buffer_size: 65535
|
||||
heat_api_uwsgi_bind_address: 0.0.0.0
|
||||
heat_api_cfn_uwsgi_bind_address: 0.0.0.0
|
||||
heat_api_cloudwatch_uwsgi_bind_address: 0.0.0.0
|
||||
|
||||
# This variable is used by the repo_build process to determine
|
||||
# which host group to check for members of before building the
|
||||
|
|
@ -290,6 +268,5 @@ heat_role_project_group: heat_all
|
|||
heat_heat_conf_overrides: {}
|
||||
heat_api_paste_ini_overrides: {}
|
||||
heat_default_yaml_overrides: {}
|
||||
heat_aws_cloudwatch_alarm_yaml_overrides: {}
|
||||
heat_aws_rds_dbinstance_yaml_overrides: {}
|
||||
heat_policy_overrides: {}
|
||||
|
|
|
|||
|
|
@ -35,10 +35,6 @@
|
|||
dest: "/etc/heat/environment.d/default.yaml"
|
||||
config_overrides: "{{ heat_default_yaml_overrides }}"
|
||||
config_type: "yaml"
|
||||
- src: "templates/AWS_CloudWatch_Alarm.yaml.j2"
|
||||
dest: "/etc/heat/templates/AWS_CloudWatch_Alarm.yaml"
|
||||
config_overrides: "{{ heat_aws_cloudwatch_alarm_yaml_overrides }}"
|
||||
config_type: "yaml"
|
||||
- src: "templates/AWS_RDS_DBInstance.yaml.j2"
|
||||
dest: "/etc/heat/templates/AWS_RDS_DBInstance.yaml"
|
||||
config_overrides: "{{ heat_aws_rds_dbinstance_yaml_overrides }}"
|
||||
|
|
|
|||
|
|
@ -38,15 +38,6 @@ pipeline = cors http_proxy_to_wsgi cfnversionnegotiation osprofiler ec2authtoken
|
|||
[pipeline:heat-api-cfn-standalone]
|
||||
pipeline = cors http_proxy_to_wsgi cfnversionnegotiation ec2authtoken context apicfnv1app
|
||||
|
||||
# heat-api-cloudwatch pipeline
|
||||
[pipeline:heat-api-cloudwatch]
|
||||
pipeline = cors versionnegotiation osprofiler ec2authtoken authtoken context apicwapp
|
||||
|
||||
# heat-api-cloudwatch pipeline for standalone heat
|
||||
# relies exclusively on authenticating with ec2 signed requests
|
||||
[pipeline:heat-api-cloudwatch-standalone]
|
||||
pipeline = cors versionnegotiation ec2authtoken context apicwapp
|
||||
|
||||
[app:apiv1app]
|
||||
paste.app_factory = heat.common.wsgi:app_factory
|
||||
heat.app_factory = heat.api.openstack.v1:API
|
||||
|
|
@ -55,10 +46,6 @@ heat.app_factory = heat.api.openstack.v1:API
|
|||
paste.app_factory = heat.common.wsgi:app_factory
|
||||
heat.app_factory = heat.api.cfn.v1:API
|
||||
|
||||
[app:apicwapp]
|
||||
paste.app_factory = heat.common.wsgi:app_factory
|
||||
heat.app_factory = heat.api.cloudwatch:API
|
||||
|
||||
[filter:versionnegotiation]
|
||||
paste.filter_factory = heat.common.wsgi:filter_factory
|
||||
heat.filter_factory = heat.api.openstack:version_negotiation_filter
|
||||
|
|
@ -75,10 +62,6 @@ heat.filter_factory = heat.api.openstack:faultwrap_filter
|
|||
paste.filter_factory = heat.common.wsgi:filter_factory
|
||||
heat.filter_factory = heat.api.cfn:version_negotiation_filter
|
||||
|
||||
[filter:cwversionnegotiation]
|
||||
paste.filter_factory = heat.common.wsgi:filter_factory
|
||||
heat.filter_factory = heat.api.cloudwatch:version_negotiation_filter
|
||||
|
||||
[filter:context]
|
||||
paste.filter_factory = heat.common.context:ContextMiddleware_filter_factory
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ stack_domain_admin_password = {{ heat_stack_domain_admin_password }}
|
|||
stack_domain_admin = {{ heat_stack_domain_admin }}
|
||||
stack_user_domain_name = {{ heat_stack_user_domain_name }}
|
||||
max_nested_stack_depth = {{ heat_max_nested_stack_depth }}
|
||||
heat_watch_server_url = {{ heat_watch_server_url }}
|
||||
heat_waitcondition_server_url = {{ heat_waitcondition_server_url }}
|
||||
heat_metadata_server_url = {{ heat_metadata_server_url }}
|
||||
|
||||
|
|
@ -59,9 +58,6 @@ workers = {{ heat_api_workers | default(heat_api_threads) }}
|
|||
[heat_api_cfn]
|
||||
bind_port = {{ heat_cfn_service_port }}
|
||||
|
||||
[heat_api_cloudwatch]
|
||||
bind_port = {{ heat_watch_port }}
|
||||
|
||||
[oslo_messaging_rabbit]
|
||||
ssl = {{ heat_rabbitmq_use_ssl }}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,16 +12,4 @@
|
|||
"cloudformation:DescribeStackResource": "",
|
||||
"cloudformation:DescribeStackResources": "rule:deny_stack_user",
|
||||
"cloudformation:ListStackResources": "rule:deny_stack_user",
|
||||
|
||||
"cloudwatch:DeleteAlarms": "rule:deny_stack_user",
|
||||
"cloudwatch:DescribeAlarmHistory": "rule:deny_stack_user",
|
||||
"cloudwatch:DescribeAlarms": "rule:deny_stack_user",
|
||||
"cloudwatch:DescribeAlarmsForMetric": "rule:deny_stack_user",
|
||||
"cloudwatch:DisableAlarmActions": "rule:deny_stack_user",
|
||||
"cloudwatch:EnableAlarmActions": "rule:deny_stack_user",
|
||||
"cloudwatch:GetMetricStatistics": "rule:deny_stack_user",
|
||||
"cloudwatch:ListMetrics": "rule:deny_stack_user",
|
||||
"cloudwatch:PutMetricAlarm": "rule:deny_stack_user",
|
||||
"cloudwatch:PutMetricData": "",
|
||||
"cloudwatch:SetAlarmState": "rule:deny_stack_user"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,9 +36,6 @@ openstack1
|
|||
[heat_api_cfn]
|
||||
openstack1
|
||||
|
||||
[heat_api_cloudwatch]
|
||||
openstack1
|
||||
|
||||
[heat_engine_container]
|
||||
openstack1
|
||||
|
||||
|
|
@ -49,6 +46,5 @@ openstack1
|
|||
heat_api
|
||||
heat_engine
|
||||
heat_api_cfn
|
||||
heat_api_cloudwatch
|
||||
heat_engine_container
|
||||
heat_apis_container
|
||||
|
|
|
|||
|
|
@ -28,6 +28,5 @@
|
|||
delay: 10
|
||||
with_items:
|
||||
- 8000
|
||||
- 8003
|
||||
- 8004
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue