Merge "Revert "Deploy Aodh services, replacing Ceilometer Alarm""

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: