Merge "Make collectd run as root inside the container"

[apex-tripleo-heat-templates.git] / docker / services / aodh-listener.yaml

diff --git a/docker/services/aodh-listener.yaml b/docker/services/aodh-listener.yaml
index 0e485ee..9db2ffb 100644 (file)
--- a/docker/services/aodh-listener.yaml
+++ b/docker/services/aodh-listener.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Aodh Listener service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerAodhListenerImage:
     description: image
-    default: 'centos-binary-aodh-listener:latest'
     type: string
   DockerAodhConfigImage:
     description: The container image to use for the aodh config_volume
-    default: 'centos-binary-aodh-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -74,10 +68,7 @@ outputs:
         config_volume: aodh
         puppet_tags: aodh_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerAodhConfigImage} ]
+        config_image: {get_param: DockerAodhConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/aodh_listener.json:
           command: /usr/bin/aodh-listener
@@ -93,10 +84,7 @@ outputs:
       docker_config:
         step_4:
           aodh_listener:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerAodhListenerImage} ]
+            image: {get_param: DockerAodhListenerImage}
             net: host
             privileged: false
             restart: always