Merge "Open up firewall for the control-ports in the bundles"

[apex-tripleo-heat-templates.git] / docker / services / iscsid.yaml

diff --git a/docker/services/iscsid.yaml b/docker/services/iscsid.yaml
index 53f5aff..f6b348c 100644 (file)
--- a/docker/services/iscsid.yaml
+++ b/docker/services/iscsid.yaml
@@ -4,19 +4,21 @@ description: >
   OpenStack containerized Iscsid service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerIscsidImage:
     description: image
-    default: 'centos-binary-iscsid:latest'
+    type: string
+  DockerIscsidConfigImage:
+    description: The container image to use for the iscsid 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
@@ -40,31 +42,43 @@ resources:
   ContainersCommon:
     type: ./containers-common.yaml
 
+  IscsidBase:
+    type: ../../puppet/services/iscsid.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
+
 outputs:
   role_data:
-    description: Role data for the Iscsid API role.
+    description: Role data for the Iscsid role.
     value:
-      service_name: iscsid
-      config_settings: {}
-      step_config: ''
-      service_config_settings: {}
+      service_name: {get_attr: [IscsidBase, role_data, service_name]}
+      config_settings: {get_attr: [IscsidBase, role_data, config_settings]}
+      step_config: &step_config
+        {get_attr: [IscsidBase, role_data, step_config]}
+      service_config_settings: {get_attr: [IscsidBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: iscsid
-        #puppet_tags: file
-        step_config: ''
-        config_image: &iscsid_image
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerIscsidImage} ]
+        puppet_tags: iscsid_config
+        step_config: *step_config
+        config_image: {get_param: DockerIscsidConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/iscsid.json:
           command: /usr/sbin/iscsid -f
+          config_files:
+            - source: "/var/lib/kolla/config_files/src-iscsid/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
       docker_config:
         step_3:
           iscsid:
             start_order: 2
-            image: *iscsid_image
+            image: {get_param: DockerIscsidImage}
             net: host
             privileged: true
             restart: always
@@ -77,14 +91,10 @@ outputs:
                   - /run/:/run/
                   - /sys:/sys
                   - /lib/modules:/lib/modules:ro
-                  - /etc/iscsi:/etc/iscsi
+                  - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
-        - name: create /etc/iscsi
-          file:
-            path: /etc/iscsi
-            state: directory
         - name: stat /lib/systemd/system/iscsid.socket
           stat: path=/lib/systemd/system/iscsid.socket
           register: stat_iscsid_socket
@@ -93,6 +103,7 @@ outputs:
           when: stat_iscsid_socket.stat.exists
       upgrade_tasks:
         - name: stat /lib/systemd/system/iscsid.service
+          tags: step2
           stat: path=/lib/systemd/system/iscsid.service
           register: stat_iscsid_service
         - name: Stop and disable iscsid service
@@ -100,6 +111,7 @@ outputs:
           service: name=iscsid state=stopped enabled=no
           when: stat_iscsid_service.stat.exists
         - name: stat /lib/systemd/system/iscsid.socket
+          tags: step2
           stat: path=/lib/systemd/system/iscsid.socket
           register: stat_iscsid_socket
         - name: Stop and disable iscsid.socket service