diff options
Diffstat (limited to 'docker/services/iscsid.yaml')
| -rw-r--r-- | docker/services/iscsid.yaml | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/docker/services/iscsid.yaml b/docker/services/iscsid.yaml index 53f5aff2..b39b72e2 100644 --- 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 @@ -53,10 +55,7 @@ outputs: config_volume: iscsid #puppet_tags: file step_config: '' - config_image: &iscsid_image - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerIscsidImage} ] + config_image: {get_param: DockerIscsidConfigImage} kolla_config: /var/lib/kolla/config_files/iscsid.json: command: /usr/sbin/iscsid -f @@ -64,7 +63,7 @@ outputs: step_3: iscsid: start_order: 2 - image: *iscsid_image + image: {get_param: DockerIscsidImage} net: host privileged: true restart: always @@ -93,6 +92,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 +100,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 |