aboutsummaryrefslogtreecommitdiffstats
path: root/network/endpoints
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2015-11-03 18:09:34 -0500
committerPradeep Kilambi <pkilambi@redhat.com>2016-03-03 13:34:38 -0500
commitf72aed85594f223b6f888e6d0af3c880ea581a66 (patch)
tree09e78a8fc800f0b9b5757e185fa9c926703442ec /network/endpoints
parentdf0c33a00bc4d64ba342803729513305371b82cd (diff)
Deploy Aodh services, replacing Ceilometer Alarm
Ceilometer Alarm is deprecated in Liberty by Aodh. This patch: * manage Aodh Keystone resources * deploy Aodh API under WSGI, Notifier, Listener and Evaluator * manage new parameters to customize Aodh deployment * uses ceilometer DB for the upgrade path * pacemaker config Depends-On: I9e34485285829884d9c954b804e3bdd5d6e31635 Depends-On: I891985da9248a88c6ce2df1dd186881f582605ee Depends-On: Ied8ba5985f43a5c5b3be5b35a091aef6ed86572f Co-Authored-By: Pradeep Kilambi <pkilambi@redhat.com> Change-Id: I58d419173e80d2462accf7324c987c71420fd5f6
Diffstat (limited to 'network/endpoints')
-rw-r--r--network/endpoints/endpoint_data.yaml9
-rw-r--r--network/endpoints/endpoint_map.yaml118
2 files changed, 127 insertions, 0 deletions
diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml
index 9d508d18..6aa725a5 100644
--- a/network/endpoints/endpoint_data.yaml
+++ b/network/endpoints/endpoint_data.yaml
@@ -1,6 +1,15 @@
# Data in this file is used to generate the endpoint_map.yaml template.
# Run the script build_endpoint_map.py to regenerate the file.
+Aodh:
+ Internal:
+ vip_param: AodhApi
+ Public:
+ vip_param: Public
+ Admin:
+ vip_param: AodhApi
+ port: 8042
+
Ceilometer:
Internal:
vip_param: CeilometerApi
diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml
index e9f97fa1..bff75722 100644
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -5,6 +5,7 @@
heat_template_version: '2015-04-30'
description: A map of OpenStack endpoints.
parameters:
+ AodhApiVirtualIP: {type: string, default: ''}
CeilometerApiVirtualIP: {type: string, default: ''}
CinderApiVirtualIP: {type: string, default: ''}
GlanceApiVirtualIP: {type: string, default: ''}
@@ -21,6 +22,9 @@ parameters:
EndpointMap:
type: json
default:
+ AodhAdmin: {protocol: http, port: '8042', host: IP_ADDRESS}
+ AodhInternal: {protocol: http, port: '8042', host: IP_ADDRESS}
+ AodhPublic: {protocol: http, port: '8042', host: IP_ADDRESS}
CeilometerAdmin: {protocol: http, port: '8777', host: IP_ADDRESS}
CeilometerInternal: {protocol: http, port: '8777', host: IP_ADDRESS}
CeilometerPublic: {protocol: http, port: '8777', host: IP_ADDRESS}
@@ -68,6 +72,120 @@ parameters:
outputs:
endpoint_map:
value:
+ AodhAdmin:
+ host:
+ str_replace:
+ template:
+ get_param: [EndpointMap, AodhAdmin, host]
+ params:
+ CLOUDNAME: {get_param: CloudName}
+ IP_ADDRESS: {get_param: AodhApiVirtualIP}
+ port:
+ get_param: [EndpointMap, AodhAdmin, port]
+ protocol:
+ get_param: [EndpointMap, AodhAdmin, protocol]
+ uri:
+ list_join:
+ - ''
+ - - get_param: [EndpointMap, AodhAdmin, protocol]
+ - ://
+ - str_replace:
+ template:
+ get_param: [EndpointMap, AodhAdmin, host]
+ params:
+ CLOUDNAME: {get_param: CloudName}
+ IP_ADDRESS: {get_param: AodhApiVirtualIP}
+ - ':'
+ - get_param: [EndpointMap, AodhAdmin, port]
+ uri_no_suffix:
+ list_join:
+ - ''
+ - - get_param: [EndpointMap, AodhAdmin, protocol]
+ - ://
+ - str_replace:
+ template:
+ get_param: [EndpointMap, AodhAdmin, host]
+ params:
+ CLOUDNAME: {get_param: CloudName}
+ IP_ADDRESS: {get_param: AodhApiVirtualIP}
+ - ':'
+ - get_param: [EndpointMap, AodhAdmin, port]
+ AodhInternal:
+ host:
+ str_replace:
+ template:
+ get_param: [EndpointMap, AodhInternal, host]
+ params:
+ CLOUDNAME: {get_param: CloudName}
+ IP_ADDRESS: {get_param: AodhApiVirtualIP}
+ port:
+ get_param: [EndpointMap, AodhInternal, port]
+ protocol:
+ get_param: [EndpointMap, AodhInternal, protocol]
+ uri:
+ list_join:
+ - ''
+ - - get_param: [EndpointMap, AodhInternal, protocol]
+ - ://
+ - str_replace:
+ template:
+ get_param: [EndpointMap, AodhInternal, host]
+ params:
+ CLOUDNAME: {get_param: CloudName}
+ IP_ADDRESS: {get_param: AodhApiVirtualIP}
+ - ':'
+ - get_param: [EndpointMap, AodhInternal, port]
+ uri_no_suffix:
+ list_join:
+ - ''
+ - - get_param: [EndpointMap, AodhInternal, protocol]
+ - ://
+ - str_replace:
+ template:
+ get_param: [EndpointMap, AodhInternal, host]
+ params:
+ CLOUDNAME: {get_param: CloudName}
+ IP_ADDRESS: {get_param: AodhApiVirtualIP}
+ - ':'
+ - get_param: [EndpointMap, AodhInternal, port]
+ AodhPublic:
+ host:
+ str_replace:
+ template:
+ get_param: [EndpointMap, AodhPublic, host]
+ params:
+ CLOUDNAME: {get_param: CloudName}
+ IP_ADDRESS: {get_param: PublicVirtualIP}
+ port:
+ get_param: [EndpointMap, AodhPublic, port]
+ protocol:
+ get_param: [EndpointMap, AodhPublic, protocol]
+ uri:
+ list_join:
+ - ''
+ - - get_param: [EndpointMap, AodhPublic, protocol]
+ - ://
+ - str_replace:
+ template:
+ get_param: [EndpointMap, AodhPublic, host]
+ params:
+ CLOUDNAME: {get_param: CloudName}
+ IP_ADDRESS: {get_param: PublicVirtualIP}
+ - ':'
+ - get_param: [EndpointMap, AodhPublic, port]
+ uri_no_suffix:
+ list_join:
+ - ''
+ - - get_param: [EndpointMap, AodhPublic, protocol]
+ - ://
+ - str_replace:
+ template:
+ get_param: [EndpointMap, AodhPublic, host]
+ params:
+ CLOUDNAME: {get_param: CloudName}
+ IP_ADDRESS: {get_param: PublicVirtualIP}
+ - ':'
+ - get_param: [EndpointMap, AodhPublic, port]
CeilometerAdmin:
host:
str_replace: