Parameterize value `enabled` for cloudwatch-api
Reason: Heat CloudWatch API has been removed from
openstack Queens and above.
Stacklight team have fired Alert about heat cloudwatch but
its a false positive since in recent heat this cloudwatch
is not longer present.
Change-Id: Id540c386f87279d4601b13510b4a548e0f20721f
Related-Prod: PROD-25742 (PROD:25742)
(cherry picked from commit 50676628308afb545d180b5c237b9e9540a0ea85)
diff --git a/apache/server/proxy/openstack/heat.yml b/apache/server/proxy/openstack/heat.yml
index d8f222a..86f9d54 100644
--- a/apache/server/proxy/openstack/heat.yml
+++ b/apache/server/proxy/openstack/heat.yml
@@ -40,7 +40,7 @@
address: ${_param:apache_proxy_openstack_api_address}
ssl: ${_param:apache_proxy_ssl}
apache_proxy_openstack_api_heat_cloudwatch:
- enabled: true
+ enabled: ${_param:openstack_heat_cloudwatch_api_enabled}
type: proxy
name: openstack_api_heat_cloudwatch
check: false
diff --git a/defaults/init.yml b/defaults/init.yml
index dec31b6..3ce4818 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -43,3 +43,8 @@
# Make sure this global variable is defined everywhere, where used it is already set on cluster level
cluster_public_host: '127.0.0.1'
single_address: '127.0.0.1'
+ # Stub parameter, to render target local_registry_mirror_image_list
+ local_docker_client_registry_target_registry: "apt:5000"
+ # Cloudwatch api removed from Queens
+ openstack_heat_cloudwatch_api_enabled: True
+
diff --git a/haproxy/proxy/listen/openstack/heat.yml b/haproxy/proxy/listen/openstack/heat.yml
index cb24614..649ce99 100644
--- a/haproxy/proxy/listen/openstack/heat.yml
+++ b/haproxy/proxy/listen/openstack/heat.yml
@@ -9,6 +9,7 @@
heat_cloudwatch_api:
type: openstack-service
service_name: heat
+ enabled: ${_param:openstack_heat_cloudwatch_api_enabled}
binds:
- address: ${_param:cluster_vip_address}
port: 8003
diff --git a/haproxy/proxy/listen/openstack/heat_large.yml b/haproxy/proxy/listen/openstack/heat_large.yml
index 2272c3e..899a691 100644
--- a/haproxy/proxy/listen/openstack/heat_large.yml
+++ b/haproxy/proxy/listen/openstack/heat_large.yml
@@ -9,6 +9,7 @@
heat_cloudwatch_api:
type: openstack-service
service_name: heat
+ enabled: ${_param:openstack_heat_cloudwatch_api_enabled}
binds:
- address: ${_param:cluster_vip_address}
port: 8003
diff --git a/nginx/server/proxy/openstack/heat_cloudwatch.yml b/nginx/server/proxy/openstack/heat_cloudwatch.yml
index 3b2dad6..bea6715 100644
--- a/nginx/server/proxy/openstack/heat_cloudwatch.yml
+++ b/nginx/server/proxy/openstack/heat_cloudwatch.yml
@@ -9,7 +9,7 @@
enabled: true
site:
nginx_proxy_openstack_api_heat_cloudwatch:
- enabled: true
+ enabled: ${_param:openstack_heat_cloudwatch_api_enabled}
type: nginx_proxy
name: openstack_api_heat_cloudwatch
proxy: