Merge "Move iscsid to a container"

This commit is contained in:
Jenkins 2017-06-14 01:00:01 +00:00 committed by Gerrit Code Review
commit d9afde3696
10 changed files with 120 additions and 0 deletions

109
docker/services/iscsid.yaml Normal file
View File

@ -0,0 +1,109 @@
heat_template_version: pike
description: >
OpenStack containerized Iscsid service
parameters:
DockerNamespace:
description: namespace
default: 'tripleoupstream'
type: string
DockerIscsidImage:
description: image
default: 'centos-binary-iscsid:latest'
type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
RoleName:
default: ''
description: Role name on which the service is applied
type: string
RoleParameters:
default: {}
description: Parameters specific to the role
type: json
DefaultPasswords:
default: {}
type: json
resources:
ContainersCommon:
type: ./containers-common.yaml
outputs:
role_data:
description: Role data for the Iscsid API role.
value:
service_name: iscsid
config_settings: {}
step_config: ''
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} ]
kolla_config:
/var/lib/kolla/config_files/iscsid.json:
command: /usr/sbin/iscsid -f
docker_config:
step_3:
iscsid:
start_order: 2
image: *iscsid_image
net: host
privileged: true
restart: always
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/iscsid.json:/var/lib/kolla/config_files/config.json:ro
- /dev/:/dev/
- /run/:/run/
- /sys:/sys
- /lib/modules:/lib/modules:ro
- /etc/iscsi:/etc/iscsi
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
- name: Stop and disable iscsid.socket service
service: name=iscsid.socket state=stopped enabled=no
when: stat_iscsid_socket.stat.exists
upgrade_tasks:
- name: stat /lib/systemd/system/iscsid.service
stat: path=/lib/systemd/system/iscsid.service
register: stat_iscsid_service
- name: Stop and disable iscsid service
tags: step2
service: name=iscsid state=stopped enabled=no
when: stat_iscsid_service.stat.exists
- name: stat /lib/systemd/system/iscsid.socket
stat: path=/lib/systemd/system/iscsid.socket
register: stat_iscsid_socket
- name: Stop and disable iscsid.socket service
tags: step2
service: name=iscsid.socket state=stopped enabled=no
when: stat_iscsid_socket.stat.exists
metadata_settings: {}

View File

@ -46,6 +46,7 @@ resource_registry:
OS::TripleO::Services::CeilometerAgentCompute: ../docker/services/ceilometer-agent-compute.yaml OS::TripleO::Services::CeilometerAgentCompute: ../docker/services/ceilometer-agent-compute.yaml
OS::TripleO::Services::CeilometerAgentNotification: ../docker/services/ceilometer-agent-notification.yaml OS::TripleO::Services::CeilometerAgentNotification: ../docker/services/ceilometer-agent-notification.yaml
OS::TripleO::Services::Horizon: ../docker/services/horizon.yaml OS::TripleO::Services::Horizon: ../docker/services/horizon.yaml
OS::TripleO::Services::Iscsid: ../docker/services/iscsid.yaml
OS::TripleO::PostDeploySteps: ../docker/post.yaml OS::TripleO::PostDeploySteps: ../docker/post.yaml
OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml

View File

@ -36,3 +36,4 @@ parameter_defaults:
- OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NeutronVppAgent
- OS::TripleO::Services::MySQLClient - OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::Docker - OS::TripleO::Services::Docker
- OS::TripleO::Services::Iscsid

View File

@ -263,6 +263,7 @@ resource_registry:
OS::TripleO::Services::NeutronVppAgent: OS::Heat::None OS::TripleO::Services::NeutronVppAgent: OS::Heat::None
OS::TripleO::Services::Docker: OS::Heat::None OS::TripleO::Services::Docker: OS::Heat::None
OS::TripleO::Services::CertmongerUser: OS::Heat::None OS::TripleO::Services::CertmongerUser: OS::Heat::None
OS::TripleO::Services::Iscsid: OS::Heat::None
parameter_defaults: parameter_defaults:
EnablePackageInstall: false EnablePackageInstall: false

View File

@ -16,6 +16,7 @@
- OS::TripleO::Services::Collectd - OS::TripleO::Services::Collectd
- OS::TripleO::Services::Docker - OS::TripleO::Services::Docker
- OS::TripleO::Services::FluentdClient - OS::TripleO::Services::FluentdClient
- OS::TripleO::Services::Iscsid
- OS::TripleO::Services::Kernel - OS::TripleO::Services::Kernel
- OS::TripleO::Services::MySQLClient - OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::Ntp - OS::TripleO::Services::Ntp

View File

@ -25,6 +25,7 @@
- OS::TripleO::Services::ComputeNeutronOvsAgent - OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker - OS::TripleO::Services::Docker
- OS::TripleO::Services::FluentdClient - OS::TripleO::Services::FluentdClient
- OS::TripleO::Services::Iscsid
- OS::TripleO::Services::Kernel - OS::TripleO::Services::Kernel
- OS::TripleO::Services::MySQLClient - OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronLinuxbridgeAgent

View File

@ -63,6 +63,7 @@
- OS::TripleO::Services::Horizon - OS::TripleO::Services::Horizon
- OS::TripleO::Services::IronicApi - OS::TripleO::Services::IronicApi
- OS::TripleO::Services::IronicConductor - OS::TripleO::Services::IronicConductor
- OS::TripleO::Services::Iscsid
- OS::TripleO::Services::Keepalived - OS::TripleO::Services::Keepalived
- OS::TripleO::Services::Kernel - OS::TripleO::Services::Kernel
- OS::TripleO::Services::Keystone - OS::TripleO::Services::Keystone

View File

@ -19,6 +19,7 @@
- OS::TripleO::Services::IronicApi - OS::TripleO::Services::IronicApi
- OS::TripleO::Services::IronicConductor - OS::TripleO::Services::IronicConductor
- OS::TripleO::Services::IronicPxe - OS::TripleO::Services::IronicPxe
- OS::TripleO::Services::Iscsid
- OS::TripleO::Services::Keystone - OS::TripleO::Services::Keystone
- OS::TripleO::Services::Memcached - OS::TripleO::Services::Memcached
- OS::TripleO::Services::MistralApi - OS::TripleO::Services::MistralApi

View File

@ -66,6 +66,7 @@
- OS::TripleO::Services::Horizon - OS::TripleO::Services::Horizon
- OS::TripleO::Services::IronicApi - OS::TripleO::Services::IronicApi
- OS::TripleO::Services::IronicConductor - OS::TripleO::Services::IronicConductor
- OS::TripleO::Services::Iscsid
- OS::TripleO::Services::Keepalived - OS::TripleO::Services::Keepalived
- OS::TripleO::Services::Kernel - OS::TripleO::Services::Kernel
- OS::TripleO::Services::Keystone - OS::TripleO::Services::Keystone
@ -154,6 +155,7 @@
- OS::TripleO::Services::ComputeNeutronOvsAgent - OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker - OS::TripleO::Services::Docker
- OS::TripleO::Services::FluentdClient - OS::TripleO::Services::FluentdClient
- OS::TripleO::Services::Iscsid
- OS::TripleO::Services::Kernel - OS::TripleO::Services::Kernel
- OS::TripleO::Services::MySQLClient - OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronLinuxbridgeAgent
@ -189,6 +191,7 @@
- OS::TripleO::Services::Collectd - OS::TripleO::Services::Collectd
- OS::TripleO::Services::Docker - OS::TripleO::Services::Docker
- OS::TripleO::Services::FluentdClient - OS::TripleO::Services::FluentdClient
- OS::TripleO::Services::Iscsid
- OS::TripleO::Services::Kernel - OS::TripleO::Services::Kernel
- OS::TripleO::Services::MySQLClient - OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::Ntp - OS::TripleO::Services::Ntp

View File

@ -22,6 +22,7 @@
- OS::TripleO::Services::IronicApi - OS::TripleO::Services::IronicApi
- OS::TripleO::Services::IronicConductor - OS::TripleO::Services::IronicConductor
- OS::TripleO::Services::IronicPxe - OS::TripleO::Services::IronicPxe
- OS::TripleO::Services::Iscsid
- OS::TripleO::Services::Keystone - OS::TripleO::Services::Keystone
- OS::TripleO::Services::Memcached - OS::TripleO::Services::Memcached
- OS::TripleO::Services::MistralApi - OS::TripleO::Services::MistralApi