Merge "Remove duplicate Iscsid service in resource registry"

diff --combined overcloud-resource-registry-puppet.j2.yaml
index 63868b5,eaf32ef..2a9f9d7
--- 1/overcloud-resource-registry-puppet.j2.yaml
--- 2/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@@ -1,8 -1,8 +1,8 @@@
  resource_registry:
  
    OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
 -  OS::TripleO::PostDeploySteps: puppet/post.yaml
 -  OS::TripleO::PostUpgradeSteps: puppet/post-upgrade.yaml
 +  OS::TripleO::PostDeploySteps: common/post.yaml
 +  OS::TripleO::PostUpgradeSteps: common/post-upgrade.yaml
    OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml
    OS::TripleO::AllNodesDeployment: OS::Heat::StructuredDeployments
    OS::TripleO::Hosts::SoftwareConfig: hosts-config.yaml
@@@ -17,7 -17,7 +17,7 @@@
  
  {% for role in roles %}
    OS::TripleO::{{role.name}}::PreNetworkConfig: OS::Heat::None
 -  OS::TripleO::{{role.name}}PostDeploySteps: puppet/post.yaml
 +  OS::TripleO::{{role.name}}PostDeploySteps: common/post.yaml
    OS::TripleO::{{role.name}}: puppet/{{role.name.lower()}}-role.yaml
    OS::TripleO::{{role.name}}Config: puppet/{{role.name.lower()}}-config.yaml
    OS::TripleO::Tasks::{{role.name}}PreConfig: OS::Heat::None
@@@ -109,8 -109,6 +109,8 @@@
  
    OS::TripleO::DeployedServerEnvironment: OS::Heat::None
  
 +  OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup
 +
    # services
    OS::TripleO::Services: common/services.yaml
    OS::TripleO::Services::Apache: puppet/services/apache.yaml
@@@ -279,7 -277,6 +279,6 @@@
    OS::TripleO::Services::NeutronVppAgent: OS::Heat::None
    OS::TripleO::Services::Docker: OS::Heat::None
    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