X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fnetwork%2Fcontrail-analytics.yaml;h=c60ffcd04036b013b305f8893c9579e5fa79e081;hb=ee5a92b9539a490ac7a0097439b6154bffe6d08a;hp=51ecbf2916e28a69fbc1d3c53e25cc1382488929;hpb=ad370ba063d4e5b97dc446b33abea44c61908cd1;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/network/contrail-analytics.yaml b/puppet/services/network/contrail-analytics.yaml
index 51ecbf29..c60ffcd0 100644
--- a/puppet/services/network/contrail-analytics.yaml
+++ b/puppet/services/network/contrail-analytics.yaml
@@ -33,6 +33,26 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  ContrailAnalyticsCollectorHttp:
+    default: 8089
+    description: Contrail Analytics Collector http port
+    type: number
+  ContrailAnalyticsCollectorSandesh:
+    default: 8086
+    description: Contrail Analytics Collector sandesh port
+    type: number
+  ContrailAnalyticsHttp:
+    default: 8090
+    description: Contrail Analytics http  port
+    type: number
+  ContrailAnalyticsRedis:
+    default: 6379
+    description: Contrail Analytics redis  port
+    type: number
+  ContrailAnalyticsApi:
+    default: 8081
+    description: Contrail Analytics Api  port
+    type: number
 
 resources:
   ContrailBase:
@@ -41,7 +61,6 @@ resources:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
-      EndpointMap: {get_param: EndpointMap}
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
 
@@ -53,14 +72,14 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [ContrailBase, role_data, config_settings]
-          - contrail::analytics::collector_http_server_port: {get_param: [EndpointMap, ContrailAnalyticsCollectorHttpInternal, port]}
-            contrail::analytics::collector_sandesh_port: {get_param: [EndpointMap, ContrailAnalyticsCollectorSandeshInternal, port]}
+          - contrail::analytics::collector_http_server_port: {get_param: ContrailAnalyticsCollectorHttp}
+            contrail::analytics::collector_sandesh_port: {get_param: ContrailAnalyticsCollectorSandesh}
             contrail::analytics::host_ip: {get_param: [ServiceNetMap, ContrailAnalyticsNetwork]}
-            contrail::analytics::http_server_port: {get_param: [EndpointMap, ContrailAnalyticsHttpInternal, port]}
+            contrail::analytics::http_server_port: {get_param: ContrailAnalyticsHttp}
             contrail::analytics::listen_ip_address: {get_param: [ServiceNetMap, ContrailAnalyticsNetwork]}
             contrail::analytics::redis_server: '127.0.0.1'
-            contrail::analytics::redis_server_port: {get_param: [EndpointMap, ContrailAnalyticsRedisInternal, port]}
+            contrail::analytics::redis_server_port: {get_param: ContrailAnalyticsRedis}
             contrail::analytics::rest_api_ip: {get_param: [ServiceNetMap, ContrailAnalyticsNetwork]}
-            contrail::analytics::rest_api_port: {get_param: [EndpointMap, ContrailAnalyticsApiInternal, port]}
+            contrail::analytics::rest_api_port: {get_param: ContrailAnalyticsApi}
       step_config: |
         include ::tripleo::network::contrail::analytics