summaryrefslogtreecommitdiffstats
path: root/network/endpoints
diff options
context:
space:
mode:
authorJames Slagle <jslagle@redhat.com>2016-03-04 15:03:45 -0500
committerJames Slagle <jslagle@redhat.com>2016-03-04 23:05:35 -0500
commit8da8b84560fc7fcc4c332c03f4242946a18955e9 (patch)
tree7020015b52f8d412b99241a8e04a150acfe65618 /network/endpoints
parent00e47eaf5b4d00ca59a8ce75a7f7a9a928dbf5c7 (diff)
Revert "Deploy Aodh services, replacing Ceilometer Alarm"
This just a revert to see if reverting this gets back to a normal CI run time. This reverts commit f72aed85594f223b6f888e6d0af3c880ea581a66. Change-Id: I04a0893f6cf69f547a4db26261005e580e1fc90b
Diffstat (limited to 'network/endpoints')
-rw-r--r--network/endpoints/endpoint_data.yaml9
-rw-r--r--network/endpoints/endpoint_map.yaml118
2 files changed, 0 insertions, 127 deletions
diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml
index 84fea0ef..7a0bbf4a 100644
--- a/network/endpoints/endpoint_data.yaml
+++ b/network/endpoints/endpoint_data.yaml
@@ -1,15 +1,6 @@
# 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 0382533a..a31094a1 100644
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -8,7 +8,6 @@ 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: ''}
@@ -25,9 +24,6 @@ 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}
@@ -75,120 +71,6 @@ 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: