Merge "Refactor iscsi initiator-name reset into separate service"

diff --combined ci/environments/multinode-containers.yaml
index d255036,e8c729f..d86d25b
--- 1/ci/environments/multinode-containers.yaml
--- 2/ci/environments/multinode-containers.yaml
+++ b/ci/environments/multinode-containers.yaml
@@@ -60,6 -60,7 +60,7 @@@ parameter_defaults
      - OS::TripleO::Services::NovaCompute
      - OS::TripleO::Services::NovaLibvirt
      - OS::TripleO::Services::Sshd
+     - OS::TripleO::Services::Iscsid
    ControllerExtraConfig:
      nova::compute::libvirt::services::libvirt_virt_type: qemu
      nova::compute::libvirt::libvirt_virt_type: qemu
@@@ -71,4 -72,3 +72,4 @@@
      ceph::profile::params::osd_max_object_namespace_len: 64
    SwiftCeilometerPipelineEnabled: False
    Debug: True
 +  NotificationDriver: 'noop'

diff --combined ci/environments/multinode.yaml
index 72b1bc4,5717946..0110915
--- 1/ci/environments/multinode.yaml
--- 2/ci/environments/multinode.yaml
+++ b/ci/environments/multinode.yaml
@@@ -58,6 -58,7 +58,7 @@@ parameter_defaults
      - OS::TripleO::Services::Horizon
      - OS::TripleO::Services::TripleoFirewall
      - OS::TripleO::Services::Sshd
+     - OS::TripleO::Services::Iscsid
    ControllerExtraConfig:
      nova::compute::libvirt::services::libvirt_virt_type: qemu
      nova::compute::libvirt::libvirt_virt_type: qemu
@@@ -69,4 -70,3 +70,4 @@@
      ceph::profile::params::osd_max_object_namespace_len: 64
    SwiftCeilometerPipelineEnabled: False
    Debug: True
 +  NotificationDriver: 'noop'

diff --combined ci/environments/multinode_major_upgrade.yaml
index ba5e333,5735636..f89549d
--- 1/ci/environments/multinode_major_upgrade.yaml
--- 2/ci/environments/multinode_major_upgrade.yaml
+++ b/ci/environments/multinode_major_upgrade.yaml
@@@ -57,6 -57,7 +57,7 @@@ parameter_defaults
      - OS::TripleO::Services::Pacemaker
      - OS::TripleO::Services::Horizon
      - OS::TripleO::Services::Sshd
+     - OS::TripleO::Services::Iscsid
    ControllerExtraConfig:
      nova::compute::libvirt::services::libvirt_virt_type: qemu
      nova::compute::libvirt::libvirt_virt_type: qemu
@@@ -65,4 -66,3 +66,4 @@@
      heat::rpc_response_timeout: 600
    SwiftCeilometerPipelineEnabled: False
    Debug: True
 +  NotificationDriver: 'noop'

diff --combined ci/environments/scenario002-multinode-containers.yaml
index b795535,3b460d3..b2e972d
--- 1/ci/environments/scenario002-multinode-containers.yaml
--- 2/ci/environments/scenario002-multinode-containers.yaml
+++ b/ci/environments/scenario002-multinode-containers.yaml
@@@ -67,9 -67,9 +67,10 @@@ parameter_defaults
      - OS::TripleO::Services::TripleoPackages
      - OS::TripleO::Services::TripleoFirewall
      - OS::TripleO::Services::Sshd
+     - OS::TripleO::Services::Iscsid
    ControllerExtraConfig:
      nova::compute::libvirt::services::libvirt_virt_type: qemu
      nova::compute::libvirt::libvirt_virt_type: qemu
    Debug: true
    SwiftCeilometerPipelineEnabled: false
 +  NotificationDriver: 'noop'

diff --combined ci/environments/scenario002-multinode.yaml
index 220979b,c21c4cf..20cd3de
--- 1/ci/environments/scenario002-multinode.yaml
--- 2/ci/environments/scenario002-multinode.yaml
+++ b/ci/environments/scenario002-multinode.yaml
@@@ -66,9 -66,9 +66,10 @@@ parameter_defaults
      - OS::TripleO::Services::TripleoPackages
      - OS::TripleO::Services::TripleoFirewall
      - OS::TripleO::Services::Sshd
+     - OS::TripleO::Services::Iscsid
    ControllerExtraConfig:
      nova::compute::libvirt::services::libvirt_virt_type: qemu
      nova::compute::libvirt::libvirt_virt_type: qemu
    Debug: true
    SwiftCeilometerPipelineEnabled: false
 +  NotificationDriver: 'noop'

diff --combined ci/environments/scenario003-multinode-containers.yaml
index 71daf8e,8d41947..274c70b
--- 1/ci/environments/scenario003-multinode-containers.yaml
--- 2/ci/environments/scenario003-multinode-containers.yaml
+++ b/ci/environments/scenario003-multinode-containers.yaml
@@@ -62,6 -62,7 +62,7 @@@ parameter_defaults
      - OS::TripleO::Services::TripleoPackages
      - OS::TripleO::Services::TripleoFirewall
      - OS::TripleO::Services::Sshd
+     - OS::TripleO::Services::Iscsid
    ControllerExtraConfig:
      nova::compute::libvirt::services::libvirt_virt_type: qemu
      nova::compute::libvirt::libvirt_virt_type: qemu
@@@ -70,4 -71,3 +71,4 @@@
    GlanceBackend: 'file'
    KeystoneTokenProvider: 'fernet'
    SwiftCeilometerPipelineEnabled: false
 +  NotificationDriver: 'noop'

diff --combined ci/environments/scenario003-multinode.yaml
index 7a72562,0c8d860..c5f1af0
--- 1/ci/environments/scenario003-multinode.yaml
--- 2/ci/environments/scenario003-multinode.yaml
+++ b/ci/environments/scenario003-multinode.yaml
@@@ -59,6 -59,7 +59,7 @@@ parameter_defaults
      - OS::TripleO::Services::TripleoPackages
      - OS::TripleO::Services::TripleoFirewall
      - OS::TripleO::Services::Sshd
+     - OS::TripleO::Services::Iscsid
    ControllerExtraConfig:
      nova::compute::libvirt::services::libvirt_virt_type: qemu
      nova::compute::libvirt::libvirt_virt_type: qemu
@@@ -67,4 -68,3 +68,4 @@@
    GlanceBackend: 'file'
    KeystoneTokenProvider: 'fernet'
    SwiftCeilometerPipelineEnabled: false
 +  NotificationDriver: 'noop'

diff --combined ci/environments/scenario004-multinode-containers.yaml
index c2a2331,b82f708..be9d613
--- 1/ci/environments/scenario004-multinode-containers.yaml
--- 2/ci/environments/scenario004-multinode-containers.yaml
+++ b/ci/environments/scenario004-multinode-containers.yaml
@@@ -77,6 -77,7 +77,7 @@@ parameter_defaults
      - OS::TripleO::Services::TripleoPackages
      - OS::TripleO::Services::TripleoFirewall
      - OS::TripleO::Services::Sshd
+     - OS::TripleO::Services::Iscsid
    ControllerExtraConfig:
      nova::compute::libvirt::services::libvirt_virt_type: qemu
      nova::compute::libvirt::libvirt_virt_type: qemu
@@@ -96,4 -97,3 +97,4 @@@
    SwiftCeilometerPipelineEnabled: false
    NeutronServicePlugins: 'router, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin'
    BgpvpnServiceProvider: 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default'
 +  NotificationDriver: 'noop'

diff --combined ci/environments/scenario004-multinode.yaml
index a15db89,7bef298..0f8666c
--- 1/ci/environments/scenario004-multinode.yaml
--- 2/ci/environments/scenario004-multinode.yaml
+++ b/ci/environments/scenario004-multinode.yaml
@@@ -77,6 -77,7 +77,7 @@@ parameter_defaults
      - OS::TripleO::Services::TripleoPackages
      - OS::TripleO::Services::TripleoFirewall
      - OS::TripleO::Services::Sshd
+     - OS::TripleO::Services::Iscsid
    ControllerExtraConfig:
      nova::compute::libvirt::services::libvirt_virt_type: qemu
      nova::compute::libvirt::libvirt_virt_type: qemu
@@@ -98,4 -99,3 +99,4 @@@
    NeutronServicePlugins: 'router, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin, networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin'
    BgpvpnServiceProvider: 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default'
    L2gwServiceProvider: ['L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.L2gwDriver:default']
 +  NotificationDriver: 'noop'

diff --combined docker/services/cinder-volume.yaml
index 2ecc7ad,6f6160f..3030019
--- 1/docker/services/cinder-volume.yaml
--- 2/docker/services/cinder-volume.yaml
+++ b/docker/services/cinder-volume.yaml
@@@ -66,15 -66,9 +66,15 @@@ 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:
@@@ -98,6 -92,10 +98,10 @@@
                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
@@@ -124,13 -122,12 +128,13 @@@
                  -
                    - /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:

diff --combined overcloud-resource-registry-puppet.j2.yaml
index dad8a0b,7c32fce..12def17
--- 1/overcloud-resource-registry-puppet.j2.yaml
--- 2/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@@ -161,7 -161,6 +161,7 @@@ resource_registry
    OS::TripleO::Services::NeutronOvsAgent: puppet/services/neutron-ovs-agent.yaml
    OS::TripleO::Services::NeutronLinuxbridgeAgent: OS::Heat::None
    OS::TripleO::Services::ComputeNeutronOvsAgent: puppet/services/neutron-ovs-agent.yaml
 +  OS::TripleO::Services::ComputeNeutronOvsDpdk: OS::Heat::None
    OS::TripleO::Services::Pacemaker: OS::Heat::None
    OS::TripleO::Services::PacemakerRemote: OS::Heat::None
    OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None
@@@ -170,6 -169,7 +170,7 @@@
    OS::TripleO::Services::HAproxy: puppet/services/haproxy.yaml
    OS::TripleO::Services::HAProxyPublicTLS: OS::Heat::None
    OS::TripleO::Services::HAProxyInternalTLS: OS::Heat::None
+   OS::TripleO::Services::Iscsid: puppet/services/iscsid.yaml
    OS::TripleO::Services::Keepalived: puppet/services/keepalived.yaml
    OS::TripleO::Services::Memcached: puppet/services/memcached.yaml
    OS::TripleO::Services::SaharaApi: OS::Heat::None
@@@ -258,7 -258,6 +259,7 @@@
    OS::TripleO::Services::CinderBackendDellSc: OS::Heat::None
    OS::TripleO::Services::CinderBackendNetApp: OS::Heat::None
    OS::TripleO::Services::CinderBackendScaleIO: OS::Heat::None
 +  OS::TripleO::Services::CinderBackendVRTSHyperScale: OS::Heat::None
    OS::TripleO::Services::CinderHPELeftHandISCSI: OS::Heat::None
    OS::TripleO::Services::Etcd: OS::Heat::None
    OS::TripleO::Services::Ec2Api: OS::Heat::None
@@@ -274,7 -273,6 +275,7 @@@
    OS::TripleO::Services::CertmongerUser: OS::Heat::None
    OS::TripleO::Services::Iscsid: OS::Heat::None
    OS::TripleO::Services::Clustercheck: OS::Heat::None
 +  OS::TripleO::Services::VRTSHyperScale: OS::Heat::None
  
  parameter_defaults:
    EnablePackageInstall: false

diff --combined roles/README.rst
index 5ac716a,3568a8d..6e83b2b
--- 1/roles/README.rst
--- 2/roles/README.rst
+++ b/roles/README.rst
@@@ -95,7 -95,6 +95,7 @@@ Exampl
    BlockStorage
    CephStorage
    Compute
 +  ComputeOvsDpdk
    Controller
    ControllerOpenstack
    Database
@@@ -152,6 -151,7 +152,7 @@@ Exampl
     * OS::TripleO::Services::ComputeNeutronOvsAgent
     * OS::TripleO::Services::Docker
     * OS::TripleO::Services::FluentdClient
+    * OS::TripleO::Services::Iscsid
     * OS::TripleO::Services::Kernel
     * OS::TripleO::Services::MySQLClient
     * OS::TripleO::Services::NeutronSriovAgent