Merge "Fix Puppet Configuring NetApp Cinder Backend"

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_controller_pacemaker.pp

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index b53346e..d85ef55 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -625,7 +625,7 @@ if hiera('step') >= 3 {
     tenant_network_types => [hiera('neutron_tenant_network_type')],
   }
   class { 'neutron::agents::ml2::ovs':
-    # manage_service   => false # not implemented
+    manage_service   => false,
     enabled          => false,
     bridge_mappings  => split(hiera('neutron_bridge_mappings'), ','),
     tunnel_types     => split(hiera('neutron_tunnel_types'), ','),
@@ -694,12 +694,31 @@ if hiera('step') >= 3 {
       "${cinder_netapp_backend}/host": value => 'hostgroup';
     }
 
-    if hiera('cinder_netapp_nfs_shares', undef) {
-      $cinder_netapp_nfs_shares = split(hiera('cinder_netapp_nfs_shares', undef), ',')
+    if hiera('cinder::backend::netapp::nfs_shares', undef) {
+      $cinder_netapp_nfs_shares = split(hiera('cinder::backend::netapp::nfs_shares', undef), ',')
     }
 
     cinder::backend::netapp { $cinder_netapp_backend :
-      nfs_shares => $cinder_netapp_nfs_shares,
+      netapp_login                 => hiera('cinder::backend::netapp::netapp_login', undef),
+      netapp_password              => hiera('cinder::backend::netapp::netapp_password', undef),
+      netapp_server_hostname       => hiera('cinder::backend::netapp::netapp_server_hostname', undef),
+      netapp_server_port           => hiera('cinder::backend::netapp::netapp_server_port', undef),
+      netapp_size_multiplier       => hiera('cinder::backend::netapp::netapp_size_multiplier', undef),
+      netapp_storage_family        => hiera('cinder::backend::netapp::netapp_storage_family', undef),
+      netapp_storage_protocol      => hiera('cinder::backend::netapp::netapp_storage_protocol', undef),
+      netapp_transport_type        => hiera('cinder::backend::netapp::netapp_transport_type', undef),
+      netapp_vfiler                => hiera('cinder::backend::netapp::netapp_vfiler', undef),
+      netapp_volume_list           => hiera('cinder::backend::netapp::netapp_volume_list', undef),
+      netapp_vserver               => hiera('cinder::backend::netapp::netapp_vserver', undef),
+      netapp_partner_backend_name  => hiera('cinder::backend::netapp::netapp_partner_backend_name', undef),
+      nfs_shares                   => $cinder_netapp_nfs_shares,
+      nfs_shares_config            => hiera('cinder::backend::netapp::nfs_shares_config', undef),
+      netapp_copyoffload_tool_path => hiera('cinder::backend::netapp::netapp_copyoffload_tool_path', undef),
+      netapp_controller_ips        => hiera('cinder::backend::netapp::netapp_controller_ips', undef),
+      netapp_sa_password           => hiera('cinder::backend::netapp::netapp_sa_password', undef),
+      netapp_storage_pools         => hiera('cinder::backend::netapp::netapp_storage_pools', undef),
+      netapp_eseries_host_type     => hiera('cinder::backend::netapp::netapp_eseries_host_type', undef),
+      netapp_webservice_path       => hiera('cinder::backend::netapp::netapp_webservice_path', undef),
     }
   }
 
@@ -974,10 +993,6 @@ if hiera('step') >= 4 {
       ocf_agent_name => "neutron:NetnsCleanup",
       clone_params => "interleave=true",
     }
-    pacemaker::resource::ocf { 'neutron-scale':
-      ocf_agent_name => "neutron:NeutronScale",
-      clone_params => "globally-unique=true clone-max=3 interleave=true",
-    }
     pacemaker::constraint::base { 'keystone-to-neutron-server-constraint':
       constraint_type => "order",
       first_resource => "${::keystone::params::service_name}-clone",
@@ -987,29 +1002,13 @@ if hiera('step') >= 4 {
       require => [Pacemaker::Resource::Service[$::keystone::params::service_name],
                   Pacemaker::Resource::Service[$::neutron::params::server_service]],
     }
-    pacemaker::constraint::base { 'neutron-server-to-neutron-scale-constraint':
+    pacemaker::constraint::base { 'neutron-server-to-neutron-ovs-cleanup-constraint':
       constraint_type => "order",
       first_resource => "${::neutron::params::server_service}-clone",
-      second_resource => "neutron-scale-clone",
-      first_action => "start",
-      second_action => "start",
-      require => [Pacemaker::Resource::Service[$::neutron::params::server_service],
-                  Pacemaker::Resource::Ocf['neutron-scale']],
-    }
-    pacemaker::constraint::base { 'neutron-scale-to-ovs-cleanup-constraint':
-      constraint_type => "order",
-      first_resource => "neutron-scale-clone",
       second_resource => "${::neutron::params::ovs_cleanup_service}-clone",
       first_action => "start",
       second_action => "start",
-      require => [Pacemaker::Resource::Ocf['neutron-scale'],
-                  Pacemaker::Resource::Ocf["${::neutron::params::ovs_cleanup_service}"]],
-    }
-    pacemaker::constraint::colocation { 'neutron-scale-to-ovs-cleanup-colocation':
-      source => "${::neutron::params::ovs_cleanup_service}-clone",
-      target => "neutron-scale-clone",
-      score => "INFINITY",
-      require => [Pacemaker::Resource::Ocf['neutron-scale'],
+      require => [Pacemaker::Resource::Service[$::neutron::params::server_service],
                   Pacemaker::Resource::Ocf["${::neutron::params::ovs_cleanup_service}"]],
     }
     pacemaker::constraint::base { 'neutron-ovs-cleanup-to-netns-cleanup-constraint':