Merge "Configure ODL Logging mechanism"

docker/services/opendaylight-api.yaml

@@ -72,7 +72,7 @@ outputs:
         config_image: {get_param: DockerOpendaylightConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/opendaylight_api.json:
-          command: /opt/opendaylight/bin/karaf
+          command: /opt/opendaylight/bin/karaf server
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
@@ -100,7 +100,6 @@ 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:
@@ -111,15 +110,13 @@ outputs:
             path: "{{ item }}"
             state: directory
           with_items:
-            - /var/log/containers/opendaylight
             - /var/lib/opendaylight/snapshots
             - /var/lib/opendaylight/journal
         - name: opendaylight logs readme
           copy:
             dest: /var/log/opendaylight/readme.txt
             content: |
-              Log files from opendaylight containers can be found under
+              Logs from opendaylight container can be found by running "docker logs opendaylight_api"
-              /var/log/containers/opendaylight.
           ignore_errors: true
       upgrade_tasks:
         - name: Check if opendaylight is deployed

environments/services-docker/neutron-opendaylight.yaml

@@ -13,3 +13,4 @@ parameter_defaults:
   NeutronPluginExtensions: 'port_security'
   NeutronMechanismDrivers: 'opendaylight_v2'
   NeutronServicePlugins: 'odl-router_v2,trunk'
+  OpenDaylightLogMechanism: 'console'

puppet/services/opendaylight-api.yaml

@@ -66,6 +66,14 @@ parameters:
       - allowed_values:
           - conntrack
           - controller
+  OpenDaylightLogMechanism:
+    description: Logging mechanism to be used
+    default: 'file'
+    type: string
+    constraints:
+      - allowed_values:
+          - file
+          - console
 
 outputs:
   role_data:
@@ -89,6 +97,7 @@ outputs:
                   - 2550
                   - 8185
         opendaylight::snat_mechanism: {get_param: OpenDaylightSNATMechanism}
+        opendaylight::log_mechanism: {get_param: OpenDaylightLogMechanism}
       step_config: |
         include tripleo::profile::base::neutron::opendaylight
       upgrade_tasks:

releasenotes/notes/ODL_log_mechanism-99f008362d2392de.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - Configure ODL to log karaf logs to file for non-containarised deployment and
+    to console for containarised deployment.