summaryrefslogtreecommitdiffstats
path: root/network/endpoints
diff options
context:
space:
mode:
authorPradeep Kilambi <pkilambi@redhat.com>2016-03-07 11:27:17 -0500
committerPradeep Kilambi <pkilambi@redhat.com>2016-03-20 10:27:21 -0400
commit2018c38ed41fe4ffcdc128081218ee6e688bd4fc (patch)
tree8919ccf1e4bc599f02a585d6318993d0555dbfcb /network/endpoints
parentc0cb85170dbd6f0c812d59d858bfeac9a2bf9de9 (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 * Add migration logic to remove pcs resources Depends-On: I5333faa72e52d2aa2a622ac2d4b60825aadc52b5 Depends-On: Ib6c9c4c35da3fb55e0ca8e2d5a58ebaf4204d792 Co-Authored-By: Emilien Macchi <emilien@redhat.com> Change-Id: Ib47a22884afb032ebc1655e1a4a06bfe70249134
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 7a0bbf4a..84fea0ef 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 a31094a1..0382533a 100644
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -8,6 +8,7 @@ description: A map of OpenStack endpoints. Since the endpoints are URLs,
parameters come from net_ip_uri_map, which will include these brackets
in IPv6 addresses.
parameters:
+ AodhApiVirtualIP: {type: string, default: ''}
CeilometerApiVirtualIP: {type: string, default: ''}
CinderApiVirtualIP: {type: string, default: ''}
GlanceApiVirtualIP: {type: string, default: ''}
@@ -24,6 +25,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}
@@ -71,6 +75,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: