X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fcinder-backup.yaml;h=dc7580a3c6d17b25ea91a05aaf79318ec786b207;hb=13c936c067807de5e6a330c4944408313b093bb2;hp=0958a7e8c21ed022358a0355fe72395eb29a6ed6;hpb=bf66addf38e3ed53f0058c82a984fef6d5a5e5aa;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/cinder-backup.yaml b/docker/services/cinder-backup.yaml
index 0958a7e8..dc7580a3 100644
--- a/docker/services/cinder-backup.yaml
+++ b/docker/services/cinder-backup.yaml
@@ -4,24 +4,21 @@ description: >
   OpenStack containerized Cinder Backup service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerCinderBackupImage:
     description: image
-    default: 'centos-binary-cinder-backup:latest'
     type: string
-  # we configure all cinder services in the same cinder base container
   DockerCinderConfigImage:
-    description: image
-    default: 'centos-binary-cinder-api:latest'
+    description: The container image to use for the cinder config_volume
     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
@@ -50,6 +47,7 @@ resources:
     type: ../../puppet/services/cinder-backup.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       RoleName: {get_param: RoleName}
@@ -69,13 +67,27 @@ outputs:
         config_volume: cinder
         puppet_tags: cinder_config,file,concat,file_line
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerCinderConfigImage} ]
+        config_image: {get_param: DockerCinderConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/cinder_backup.json:
           command: /usr/bin/cinder-backup --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
+          config_files:
+            # NOTE(mandre): the copy of ceph conf will need to go once we
+            # generate a ceph.conf for cinder in puppet
+            # Copy ceph config files before cinder ones as a precaution, for
+            # the later one to take precendence in case of duplicate files.
+            - source: "/var/lib/kolla/config_files/src-ceph/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
+            - source: "/var/lib/kolla/config_files/src-iscsid/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/lib/cinder
               owner: cinder:cinder
@@ -87,10 +99,7 @@ outputs:
         step_3:
           cinder_backup_init_logs:
             start_order: 0
-            image: &cinder_backup_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerCinderBackupImage} ]
+            image: &cinder_backup_image {get_param: DockerCinderBackupImage}
             privileged: false
             user: root
             volumes:
@@ -107,13 +116,14 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/cinder_backup.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/cinder/etc/cinder/:/etc/cinder/:ro
-                  - /var/lib/config-data/ceph/etc/ceph/:/etc/ceph/:ro #FIXME: we need to generate a ceph.conf with puppet for this
+                  - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
+                  # FIXME: we need to generate a ceph.conf with puppet for this
+                  - /var/lib/config-data/puppet-generated/ceph/:/var/lib/kolla/config_files/src-ceph:ro
                   - /dev/:/dev/
                   - /run/:/run/
                   - /sys:/sys
                   - /lib/modules:/lib/modules:ro
-                  - /etc/iscsi:/etc/iscsi
                   - /var/lib/cinder:/var/lib/cinder
                   - /var/log/containers/cinder:/var/log/cinder
             environment: