X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fopendaylight-api.yaml;h=6a62f65e96f29b9b5bedc44782dbee34e8630765;hb=7585e655a6f4662ba48c2c9850f7938346d8137f;hp=cb47668599c1a475c816d27354ef23b6a21c69ca;hpb=f613d1623dffc57a62abbc54ae62f31720d97f24;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/opendaylight-api.yaml b/docker/services/opendaylight-api.yaml
index cb476685..6a62f65e 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}
@@ -62,23 +61,22 @@ outputs:
         map_merge:
           - get_attr: [OpenDaylightBase, role_data, config_settings]
       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
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /opt/opendaylight
               owner: odl:odl
@@ -87,10 +85,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
@@ -101,12 +96,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/opendaylight_api.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/opendaylight/opt/opendaylight/data/idmlight.db.mv.db:/opt/opendaylight/data/idmlight.db.mv.db
-                  - /var/lib/config-data/opendaylight/opt/opendaylight/configuration/initial/:/opt/opendaylight/configuration/initial/
-                  - /var/lib/config-data/opendaylight/opt/opendaylight/etc/jetty.xml:/opt/opendaylight/etc/jetty.xml:ro
-                  - /var/lib/config-data/opendaylight/opt/opendaylight/etc/org.apache.karaf.features.cfg:/opt/opendaylight/etc/org.apache.karaf.features.cfg:ro
-                  - /var/lib/config-data/opendaylight/opt/opendaylight/etc/org.ops4j.pax.logging.cfg:/opt/opendaylight/etc/org.ops4j.pax.logging.cfg:ro
-                  - /var/lib/config-data/opendaylight/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg:/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg:ro
+                  - /var/lib/config-data/puppet-generated/opendaylight/:/var/lib/kolla/config_files/src:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS