X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fcinder-volume.yaml;h=3030019c4ec94629ec18ee7dda70c166dcd56202;hb=f1ff69d1a24414dc3da47b5e33e440210386d4dc;hp=210ab4c9db926c5b25d53d16efb92a70dbfc8fea;hpb=07a5fe1ba66cbad5afafbbd30d2d78129cb90bae;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml
index 210ab4c9..3030019c 100644
--- a/docker/services/cinder-volume.yaml
+++ b/docker/services/cinder-volume.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Cinder Volume service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerCinderVolumeImage:
     description: image
-    default: 'centos-binary-cinder-volume:latest'
     type: string
   DockerCinderConfigImage:
     description: The container image to use for the cinder config_volume
-    default: 'centos-binary-cinder-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -72,19 +66,22 @@ outputs:
     description: Role data for the Cinder Volume role.
     value:
       service_name: {get_attr: [CinderBase, role_data, service_name]}
-      config_settings: {get_attr: [CinderBase, role_data, config_settings]}
+      config_settings:
+        map_merge:
+          - get_attr: [CinderBase, role_data, config_settings]
+          - tripleo::profile::base::lvm::enable_udev: false
       step_config: &step_config
-        get_attr: [CinderBase, role_data, step_config]
+        list_join:
+          - "\n"
+          - - "include ::tripleo::profile::base::lvm"
+            - get_attr: [CinderBase, role_data, step_config]
       service_config_settings: {get_attr: [CinderBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         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_volume.json:
           command: /usr/bin/cinder-volume --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
@@ -101,6 +98,10 @@ outputs:
               dest: "/"
               merge: true
               preserve_properties: true
+            - source: "/var/lib/kolla/config_files/src-iscsid/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/log/cinder
               owner: cinder:cinder
@@ -109,10 +110,7 @@ outputs:
         step_3:
           cinder_volume_init_logs:
             start_order: 0
-            image: &cinder_volume_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerCinderVolumeImage} ]
+            image: &cinder_volume_image {get_param: DockerCinderVolumeImage}
             privileged: false
             user: root
             volumes:
@@ -130,12 +128,13 @@ outputs:
                 -
                   - /var/lib/kolla/config_files/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro
                   - /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
+                  - /lib/modules:/lib/modules:ro
                   - /dev/:/dev/
                   - /run/:/run/
                   - /sys:/sys
-                  - /etc/iscsi:/etc/iscsi
                   - /var/lib/cinder:/var/lib/cinder
                   - /var/log/containers/cinder:/var/log/cinder
             environment: