X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fopendaylight-api.yaml;h=dbe49e9be1b64bf265cb609e72c00cd819d8b1f1;hb=684bb3689501376f44be677adde4f00ce7185928;hp=5610d1ba9e1ce305ce3356ba9c8424dcc4e27b8a;hpb=cdd6d4872e9fdad9d9390d062ec730854c8643a5;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/opendaylight-api.yaml b/docker/services/opendaylight-api.yaml
index 5610d1ba..dbe49e9b 100644
--- a/docker/services/opendaylight-api.yaml
+++ b/docker/services/opendaylight-api.yaml
@@ -4,23 +4,21 @@ description: >
   OpenStack containerized OpenDaylight API service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerOpendaylightApiImage:
     description: image
-    default: 'centos-binary-opendaylight:latest'
     type: string
   DockerOpendaylightConfigImage:
     description: image
-    default: 'centos-binary-opendaylight:latest'
     type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -48,6 +46,7 @@ resources:
     type: ../../puppet/services/opendaylight-api.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       RoleName: {get_param: RoleName}
@@ -61,21 +60,17 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [OpenDaylightBase, role_data, config_settings]
+      logging_source: {get_attr: [OpenDaylightBase, role_data, logging_source]}
+      logging_groups: {get_attr: [OpenDaylightBase, role_data, logging_groups]}
       step_config: &step_config
-        list_join:
-          - "\n"
-          - - get_attr: [OpenDaylightBase, role_data, step_config]
-            - "include tripleo::profile::base::neutron::opendaylight::create_cluster"
+        get_attr: [OpenDaylightBase, role_data, step_config]
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: opendaylight
         # 'file,concat,file_line,augeas' are included by default
-        puppet_tags: odl_user,tripleo::profile::base::neutron::opendaylight::configure_cluster
+        puppet_tags: odl_user
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerOpendaylightConfigImage} ]
+        config_image: {get_param: DockerOpendaylightConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/opendaylight_api.json:
           command: /opt/opendaylight/bin/karaf
@@ -92,10 +87,7 @@ outputs:
         step_1:
           opendaylight_api:
             start_order: 0
-            image: &odl_api_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerOpendaylightApiImage} ]
+            image: &odl_api_image {get_param: DockerOpendaylightApiImage}
             privileged: false
             net: host
             detach: true
@@ -107,10 +99,21 @@ outputs:
                 -
                   - /var/lib/kolla/config_files/opendaylight_api.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/opendaylight/:/var/lib/kolla/config_files/src:ro
+                  - /var/log/containers/opendaylight:/opt/opendaylight/data/log
+                  - /var/lib/opendaylight/journal:/opt/opendaylight/journal
+                  - /var/lib/opendaylight/snapshots:/opt/opendaylight/snapshots
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-
+      host_prep_tasks:
+        - name: create persistent directories
+          file:
+            path: "{{ item }}"
+            state: directory
+          with_items:
+            - /var/log/containers/opendaylight
+            - /var/lib/opendaylight/snapshots
+            - /var/lib/opendaylight/journal
       upgrade_tasks:
         - name: Stop and disable opendaylight_api service
           tags: step2
-          service: name=opendaylight state=stopped enabled=no
+          service: name=opendaylight state=stopped enabled=no
\ No newline at end of file