staypuft 0.5.0 → 0.5.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDYwM2Y4Nzc0YWE3Y2NjMGU2MzEwNDg3MTU0ZjY2Y2IzYjBhNzc3Ng==
+    MDZhMjQ5YWJmZTcwY2ZiYWVjNzdiZWMyNDM1MzBlZDA0YTFkYzgzMQ==
   data.tar.gz: !binary |-
-    NDcyMjFkN2Q5OWZhZDU0MzA0M2RmOWM2ZjkyMTFlZTAyNmFmZDhhMw==
+    ZTNjYWI1NjQ5NDVjNTNkZDU2NjI4ZjAzMjI3NzY5MTk5OTRmYzNhNg==
 SHA512:
   metadata.gz: !binary |-
-    ZWRlZWU5YWMzMjMyODcyMGIxZjRhNzIxYzJiNTEwZDhhZDNiMzFiNzcxYzQ1
-    ZTEyNWYzNjY4YjI2NDMyM2I5MThjZGVmYWFhMWU0ZTI3ZTk3ZGUzMWQ4YWVh
-    YjI4ZTE5NDE4NGYzMmQ3OGUyYjI4YWZhOGZjMzQzNWZkZTc5M2M=
+    YTA0NmYxNDZiZTAyNjQyYWRjNTAyZmI3MjI2YjNkOTYwZDk3MWI0ZGQxYjZl
+    ZjU1NWUxY2NhY2VmMzc1NjA4YzY2NDk2MDViOWEzOGE4YjRlYWMxMjA2MTBi
+    YjMzZWYzMjNjMTUxZWQ1OWNjODI1ZGJhNTExOWEzYjZjMjk5NzY=
   data.tar.gz: !binary |-
-    NGNmYzQwOWE5NDUxOTFjMTc5NzllNmI0NzAyNmYxZDA4ZGFmNjY4ZTY4ZDJj
-    NjQyZTdlYWI2ZWQ5MWE0OGM0MjFhMTA1OTFkN2UwYjEyMWZkZTc2ZGI2Mzc0
-    MGFlNDFmNjYyODdkNmUxOThlZjc1ZGVkNDA2MDliYmZlYTBiMTM=
+    MDZhOGFmMTNjN2M1YTAwMGEzZjgzYmJiYmQ5NzBhZGFmNzY4MWU5MjI2ZWEw
+    MmI1ZDc4YTljMDViZjg3NTNlZTJhZDE3ZjBhYmE1MGNmZmRkNTdjMDNmYmI1
+    ODg4YTY0MGJlM2M4MTUzOWIyNjVkNGRjYzIzOGI3M2QxOTQ0OTc=

data/app/assets/javascripts/staypuft/staypuft.js

@@ -115,6 +115,18 @@ $(function () {
     }
   }
 
+  showTenantNetworkType();
+  $("#staypuft_deployment_neutron_ml2_openvswitch").change(showTenantNetworkType);
+  function showTenantNetworkType() {
+$('.neutron_ml2_mechanisms').parent().parent().removeClass('col-md-6').addClass('col-md-8');
+    if($("#staypuft_deployment_neutron_ml2_openvswitch").is(":checked")) {
+      $("#staypuft_deployment_neutron_ml2_openvswitch").parent().after($("label[for='network_segmentation']").parent())
+      $("label[for='network_segmentation']").parent().fadeIn(duration);
+    } else {
+      $("label[for='network_segmentation']").parent().fadeOut(duration);
+    }
+  }
+
   showNeutronN1kvParameters();
   $("input[name='staypuft_deployment[neutron][core_plugin]']").change(showNeutronN1kvParameters);
   function showNeutronN1kvParameters() {
@@ -138,6 +150,35 @@ $(function () {
     }
   }
 
+  showControllerWarning("glance");
+  showControllerWarning("cinder");
+  $("input[name='staypuft_deployment[glance][driver_backend]'").change(function(){
+    console.log("glance");
+    showControllerWarning("glance")
+  });
+  $("#staypuft_deployment_cinder_backend_lvm").change(function(){
+    console.log("cinder");
+    showControllerWarning("cinder")
+  });
+  function showControllerWarning(which_warning) {
+    if(which_warning == "glance") {
+      if($("#staypuft_deployment_glance_driver_backend_local").is(":checked")) {
+        $('.glance-controller-warning').find(".replace").html(" (Local File)");
+        $('.glance-controller-warning').show();
+      } else {
+        $('.glance-controller-warning').hide();
+      }
+    }
+    if(which_warning == "cinder") {
+      if($("#staypuft_deployment_cinder_backend_lvm").is(":checked")) {
+        $('.cinder-controller-warning').find(".replace").html(" (LVM)");
+        $('.cinder-controller-warning').show();
+      } else {
+        $('.cinder-controller-warning').hide();
+      }
+    }
+  }
+
   showGlanceNfsNetworkPath();
   $("input[name='staypuft_deployment[glance][driver_backend]']").change(showGlanceNfsNetworkPath);
   function showGlanceNfsNetworkPath() {

data/app/controllers/staypuft/steps_controller.rb

@@ -10,7 +10,7 @@ module Staypuft
       when :deployment_settings
         @layouts = ordered_layouts
       when :services_overview
-        if !@deployment.ha? && @deployment.cinder.lvm_ptable.nil?
+        if @deployment.cinder.lvm_ptable.nil?
           flash[:warning] = "Missing Partition Table 'LVM with cinder-volumes', LVM cinder backend won't work." 
         end
       when :network_configuration

data/app/lib/staypuft/network_query.rb

@@ -59,6 +59,14 @@ module Staypuft
       interface_hash_for_host(subnet_type_name, host)[:subnet]
     end
 
+    def mtu_for_tenant_subnet
+      mtu = @deployment.neutron_networking? ? @deployment.neutron.network_device_mtu : @deployment.nova.network_device_mtu
+    end
+
+    def tenant_subnet?(subnet, host=@host)
+      subnet == subnet_for_host(Staypuft::SubnetType::TENANT, host)
+    end
+
     def gateway_subnet(host=@host)
       gateway_hash_for_host(host)[:subnet]
     end
@@ -79,10 +87,6 @@ module Staypuft
       controllers.map { |controller| ip_for_host(subnet_type_name, controller) }
     end
 
-    def controller_ip(subnet_type_name)
-      ip_for_host(subnet_type_name, controllers.tap { |v| v.size == 1 or raise('only one controller is allowed') }.first)
-    end
-
     def controller_fqdns
       controllers.map &:fqdn
     end
@@ -91,6 +95,12 @@ module Staypuft
       controllers.map &:shortname
     end
 
+    def controller_pcmk_shortnames
+      controllers.map do |controller|
+        "pcmk-"+controller.shortname
+      end
+    end
+
     def get_vip(vip_name)
       if VIP_NAMES[vip_name]
         interface = @deployment.vip_nics.where(:tag => vip_name).first
@@ -100,8 +110,9 @@ module Staypuft
 
     class Jail < Safemode::Jail
       allow :ip_for_host, :interface_for_host, :network_address_for_host,
-            :controller_ip, :controller_ips, :controller_fqdns, :get_vip,
-            :subnet_for_host, :gateway_subnet, :gateway_interface, :gateway_interface_mac
+            :controller_ip, :controller_ips, :controller_fqdns, :get_vip, :controller_pcmk_shortnames,
+            :subnet_for_host, :gateway_subnet, :gateway_interface, :gateway_interface_mac,
+            :tenant_subnet?, :mtu_for_tenant_subnet
     end
 
     private

data/app/lib/staypuft/seeder.rb

@@ -58,51 +58,39 @@ module Staypuft
     }
 
     # key (:ha, etc) is only  used internally for referencing from roles
-    LAYOUTS        = { :ha_nova        => { :name       => 'High Availability Controllers / Compute',
-                                            :networking => 'nova' },
-                       :non_ha_nova    => { :name       => 'Controller / Compute',
-                                            :networking => 'nova' },
-                       :ha_neutron     => { :name       => 'High Availability Controllers / Compute',
-                                            :networking => 'neutron' },
-                       :non_ha_neutron => { :name       => 'Controller / Compute',
-                                            :networking => 'neutron' } }
+    LAYOUTS        = { :nova        => { :name       => 'Controllers / Compute',
+                                         :networking => 'nova' },
+                       :neutron     => { :name       => 'Controllers / Compute',
+                                         :networking => 'neutron' } }
 
     # some services don't have puppetclasses yet, since they aren't broken out on the back end
     SERVICES       = {
-        :non_ha_amqp        => { :name => 'AMQP (non-HA)', :class => [] },
-        :mysql              => { :name => 'MySQL', :class => [] },
-        :non_ha_keystone    => { :name => 'Keystone (non-HA)', :class => [] },
-        :nova_controller    => { :name => 'Nova (Controller)', :class => [] },
-        :neutron_controller => { :name => 'Neutron (Controller)', :class => [] },
-        :non_ha_glance      => { :name => 'Glance (non-HA)', :class => [] },
-        :cinder_controller  => { :name => 'Cinder (controller)', :class => [] },
         :cinder_node        => { :name => 'Cinder (node)', :class => ['quickstack::storage_backend::cinder'] },
-        :heat               => { :name => 'Heat', :class => [] },
-        :ceilometer         => { :name => 'Ceilometer', :class => [] },
-        :neutron_networker  => { :name => 'Neutron Networker', :class => ['quickstack::neutron::networker'] },
         :nova_compute       => { :name => 'Nova-compute', :class => ['quickstack::nova_network::compute'] },
         :neutron_compute    => { :name => 'Neutron-compute', :class => ['quickstack::neutron::compute'] },
-        :swift              => { :name => 'Swift (node)', :class => ['quickstack::swift::storage'] },
-        :ha_controller      => { :name  => 'HA (Controller)',
+        :swift_node         => { :name => 'Swift (node)', :class => ['quickstack::swift::storage'] },
+        :controller         => { :name  => 'Controller',
                                  :class => ['quickstack::openstack_common',
                                             'quickstack::pacemaker::common',
                                             'quickstack::pacemaker::params'] },
-        :keystone_ha        => { :name  => 'Keystone (HA)',
+        :keystone           => { :name  => 'Keystone',
                                  :class => ['quickstack::pacemaker::keystone'] },
-        :load_balancer_ha   => { :name  => 'Load Balancer (HA)',
+        :load_balancer      => { :name  => 'Load Balancer',
                                  :class => ['quickstack::pacemaker::load_balancer'] },
-        :memcached_ha       => { :name  => 'Memcached (HA)',
+        :memcached          => { :name  => 'Memcached',
                                  :class => ['quickstack::pacemaker::memcached'] },
-        :qpid_ha            => { :name => 'qpid (HA)', :class => ['quickstack::pacemaker::qpid'] },
-        :glance_ha          => { :name => 'Glance (HA)', :class => ['quickstack::pacemaker::glance'] },
-        :nova_ha            => { :name => 'Nova (HA)', :class => ['quickstack::pacemaker::nova'] },
-        :heat_ha            => { :name => 'Heat (HA)', :class => ['quickstack::pacemaker::heat'] },
-        :cinder_ha          => { :name => 'Cinder (HA)', :class => ['quickstack::pacemaker::cinder'] },
-        :swift_ha           => { :name => 'Swift (HA)', :class => ['quickstack::pacemaker::swift'] },
-        :horizon_ha         => { :name => 'Horizon (HA)', :class => ['quickstack::pacemaker::horizon'] },
-        :galera_ha          => { :name => 'Galera (HA)', :class => ['quickstack::pacemaker::galera'] },
-        :mysql_ha           => { :name => 'Mysql (HA)', :class => ['quickstack::pacemaker::mysql'] },
-        :neutron_ha         => { :name => 'Neutron (HA)', :class => ['quickstack::pacemaker::neutron'] },
+        :qpid               => { :name => 'qpid', :class => ['quickstack::pacemaker::qpid'] },
+        :glance             => { :name => 'Glance', :class => ['quickstack::pacemaker::glance'] },
+        :nova               => { :name => 'Nova', :class => ['quickstack::pacemaker::nova'] },
+        :heat               => { :name => 'Heat', :class => ['quickstack::pacemaker::heat'] },
+        :cinder             => { :name => 'Cinder', :class => ['quickstack::pacemaker::cinder'] },
+        :swift              => { :name => 'Swift', :class => ['quickstack::pacemaker::swift'] },
+        :horizon            => { :name => 'Horizon', :class => ['quickstack::pacemaker::horizon'] },
+        :galera             => { :name => 'Galera', :class => ['quickstack::pacemaker::galera'] },
+        :mysql              => { :name => 'Mysql', :class => ['quickstack::pacemaker::mysql'] },
+        :ceilometer         => { :name => 'Ceilometer', :class => ['quickstack::pacemaker::nosql',
+                                                                        'quickstack::pacemaker::ceilometer'] },
+        :neutron            => { :name => 'Neutron', :class => ['quickstack::pacemaker::neutron'] },
         :generic_rhel_7     => { :name => 'Generic RHEL 7', :class => ['quickstack::openstack_common'] },
         :ceph_osd           => { :name => 'Ceph Storage (OSD) (node)',
                                  :class => ['quickstack::openstack_common',
@@ -116,33 +104,16 @@ module Staypuft
     # until we get the real list of roles per layout
     # layout refs below specify layout keys from layouts hash
     ROLES          = [
-        { :name          => 'Controller (Nova)',
-          :class         => 'quickstack::nova_network::controller',
-          :layouts       => [[:non_ha_nova, 1]],
-          :services      => [:non_ha_amqp, :mysql, :non_ha_keystone, :nova_controller, :non_ha_glance,
-                             :cinder_controller, :heat, :ceilometer],
-          :orchestration => 'concurrent' },
         { :name          => 'Compute (Nova)',
           :class         => [],
-          :layouts       => [[:ha_nova, 10], [:non_ha_nova, 10]],
+          :layouts       => [[:nova, 10]],
           :services      => [:nova_compute],
           :orchestration => 'leader' },
-        { :name          => 'Controller (Neutron)',
-          :class         => 'quickstack::neutron::controller',
-          :layouts       => [[:non_ha_neutron, 1]],
-          :services      => [:non_ha_amqp, :mysql, :non_ha_keystone, :neutron_controller, :non_ha_glance,
-                             :cinder_controller, :heat, :ceilometer],
-          :orchestration => 'concurrent' },
         { :name          => 'Compute (Neutron)',
           :class         => [],
-          :layouts       => [[:ha_neutron, 10], [:non_ha_neutron, 10]],
+          :layouts       => [[:neutron, 10]],
           :services      => [:neutron_compute],
           :orchestration => 'concurrent' },
-        { :name          => 'Neutron Networker',
-          :class         => [],
-          :layouts       => [[:non_ha_neutron, 3]],
-          :services      => [:neutron_networker],
-          :orchestration => 'concurrent' },
         { :name          => 'Cinder Block Storage',
           :class         => [],
           :layouts       => [],
@@ -153,21 +124,21 @@ module Staypuft
           :layouts       => [],
           :services      => [:swift],
           :orchestration => 'concurrent' },
-        { :name          => 'HA Controller',
+        { :name          => 'Controller',
           :class         => [],
-          :layouts       => [[:ha_nova, 1], [:ha_neutron, 1]],
-          :services      => [:ha_controller, :keystone_ha, :load_balancer_ha, :memcached_ha, :qpid_ha,
-                             :glance_ha, :nova_ha, :heat_ha, :cinder_ha, :swift_ha, :horizon_ha, :mysql_ha,
-                             :neutron_ha, :galera_ha],
+          :layouts       => [[:nova, 1], [:neutron, 1]],
+          :services      => [:controller, :keystone, :load_balancer, :memcached, :qpid,
+                             :glance, :nova, :heat, :cinder, :swift, :horizon, :mysql,
+                             :neutron, :galera, :ceilometer],
           :orchestration => 'concurrent' },
         { :name          => 'Generic RHEL 7',
           :class         => '',
-          :layouts       => [[:non_ha_nova, 20],[:non_ha_neutron, 20], [:ha_nova, 20], [:ha_neutron, 20]],
+          :layouts       => [[:nova, 20], [:neutron, 20]],
           :services      => [:generic_rhel_7],
           :orchestration => 'concurrent' },
         { :name          => 'Ceph Storage Node (OSD)',
           :class         => '',
-          :layouts       => [[:non_ha_nova, 20], [:non_ha_neutron, 20], [:ha_nova, 20], [:ha_neutron, 20]],
+          :layouts       => [[:nova, 20], [:neutron, 20]],
           :services      => [:ceph_osd],
           :orchestration => 'concurrent' },
       ]
@@ -233,7 +204,7 @@ module Staypuft
     }
 
     def get_host_format(param_name, subnet_type_name)
-      { :string => "<%= d = @host.deployment; d.ha? ? d.network_query.get_vip(:#{param_name}) : d.network_query.controller_ip('#{subnet_type_name}') %>" }
+      { :string => "<%= @host.deployment.network_query.get_vip(:#{param_name}) %>" }
     end
 
     # virtual ip addresses
@@ -244,7 +215,7 @@ module Staypuft
     def functional_dependencies
       amqp_provider               = { :string => '<%= @host.deployment.amqp_provider %>' }
       neutron                     = { :string => '<%= @host.deployment.neutron_networking? %>' }
-      ceilometer                  = { :string => '<%= @host.deployment.non_ha? %>' }
+      ceilometer                  = true
 
       # Nova
       network_manager             = { :string => '<%= @host.deployment.nova.network_manager %>' }
@@ -264,6 +235,7 @@ module Staypuft
                                                   'quota_fixed_ips' => 'default',
                                                   'quota_driver' => 'default' }
                                     }
+      nova_network_device_mtu     = { :string => '<%= @host.deployment.nova.network_device_mtu %>' }
 
       # Neutron
       ovs_vlan_ranges             = { :array =>  '<%= @host.deployment.neutron.networker_vlan_ranges %>' }
@@ -272,7 +244,6 @@ module Staypuft
       tenant_network_type         = '<%= @host.deployment.neutron.network_segmentation %>'
       ml2_tenant_network_types    = [ tenant_network_type ]
       ml2_tunnel_id_ranges        = ['10:1000']
-      ml2_vni_ranges              = ['10:1000']
       ml2_mechanism_drivers       = { :array =>  '<%= @host.deployment.neutron.ml2_mechanisms %>' }
       ovs_tunnel_types            = { :array =>  '<%= @host.deployment.neutron.ovs_tunnel_types %>' }
       ovs_tunnel_iface            = { :string => '<%= n = @host.deployment.neutron; n.enable_tunneling? ? n.tenant_iface(@host) : "" %>' }
@@ -293,6 +264,7 @@ module Staypuft
                                                       'quota_security_group_rule' => 'default',
                                                       'network_auto_schedule' => 'default' }
                                         }
+      neutron_network_device_mtu  = { :string => '<%= @host.deployment.neutron.network_device_mtu %>' }
 
       # Glance
       backend                     = { :string => '<%= @host.deployment.glance.backend %>' }
@@ -301,24 +273,17 @@ module Staypuft
       pcmk_fs_dir                 = '/var/lib/glance/images'
       pcmk_fs_manage              = { :string => '<%= @host.deployment.glance.pcmk_fs_manage %>' }
       pcmk_fs_options             = { :string => '<%= @host.deployment.glance.pcmk_fs_options %>' }
-      glance_rbd_store_user       = 'images'
-      glance_rbd_store_pool       = 'images'
 
       # Cinder
       volume                      = true
       cinder_backend_gluster      = false
-      cinder_backend_gluster_name = 'gluster'
       cinder_backend_iscsi        = { :string => '<%= @host.deployment.cinder.lvm_backend? %>' }
-      cinder_backend_iscsi_name   = 'iscsi'
       cinder_backend_nfs          = { :string => '<%= @host.deployment.cinder.nfs_backend? %>' }
-      cinder_backend_nfs_name     = 'nfs'
       cinder_multiple_backends    = { :string => '<%= @host.deployment.cinder.multiple_backends? %>' }
-      cinder_create_volume_types  = true
       cinder_nfs_shares           = ['<%= @host.deployment.cinder.nfs_uri %>']
       cinder_nfs_mount_options    = 'nosharecache'
 
       cinder_backend_rbd                      = { :string => '<%= @host.deployment.cinder.ceph_backend? %>' }
-      cinder_backend_rbd_name                 = 'rbd'
       cinder_rbd_pool                         = 'volumes'
       cinder_rbd_ceph_conf                    = '/etc/ceph/ceph.conf'
       cinder_rbd_flatten_volume_from_snapshot = 'false'
@@ -327,7 +292,6 @@ module Staypuft
       cinder_rbd_secret_uuid                  = { :string => '<%= @host.deployment.cinder.rbd_secret_uuid %>' }
 
       cinder_backend_eqlx           = { :string => '<%= @host.deployment.cinder.equallogic_backend? %>' }
-      cinder_backend_eqlx_name      = { :array => '<%= @host.deployment.cinder.compute_eqlx_backend_names %>'}
       # TODO: confirm these params and add them to model where user input is needed
       # below dynamic calls are commented out since the model does not yet have san/chap entries
       cinder_san_ip                 = { :array => '<%= @host.deployment.cinder.compute_eqlx_san_ips %>' }
@@ -379,10 +343,8 @@ module Staypuft
       neutron_user_pw               = { :string => '<%= @host.deployment.passwords.effective_value(:neutron_user) %>' }
       nova_db_pw                    = { :string => '<%= @host.deployment.passwords.effective_value(:nova_db) %>' }
       nova_user_pw                  = { :string => '<%= @host.deployment.passwords.effective_value(:nova_user) %>' }
-      swift_admin_pw                = { :string => '<%= @host.deployment.passwords.effective_value(:swift_admin) %>' }
       swift_user_pw                 = { :string => '<%= @host.deployment.passwords.effective_value(:swift_user) %>' }
       amqp_pw                       = { :string => '<%= @host.deployment.passwords.effective_value(:amqp) %>' }
-      amqp_nssdb_pw                 = { :string => '<%= @host.deployment.passwords.effective_value(:amqp_nssdb) %>' }
       keystone_admin_token          = { :string => '<%= @host.deployment.passwords.effective_value(:keystone_admin_token) %>' }
 
       #these don't share the user-supplied password value; they're always a random per param value
@@ -404,10 +366,6 @@ module Staypuft
       # public API
       nova_host    = get_host_format :nova_public_vip, Staypuft::SubnetType::PUBLIC_API
 
-      controller_admin_host = { :string => "<%= d = @host.deployment; d.ha? ? nil : d.network_query.controller_ip('#{Staypuft::SubnetType::ADMIN_API}') %>"}
-      controller_priv_host  = { :string => "<%= d = @host.deployment; d.ha? ? nil : d.network_query.controller_ip('#{Staypuft::SubnetType::MANAGEMENT}') %>"}
-      controller_pub_host   = { :string => "<%= d = @host.deployment; d.ha? ? nil : d.network_query.controller_ip('#{Staypuft::SubnetType::PUBLIC_API}') %>"}
-
       fencing_type                   = { :string => '<%= (@host.bmc_nic && @host.bmc_nic.fencing_enabled?) ? @host.bmc_nic.attrs["fencing_type"] : "disabled" %>' }
       fence_ipmilan_address          = { :string => '<%= @host.bmc_nic.ip if @host.bmc_nic && @host.bmc_nic.fencing_enabled? %>' }
       fence_ipmilan_username         = { :string => '<%= @host.bmc_nic.username if @host.bmc_nic && @host.bmc_nic.fencing_enabled? %>' }
@@ -434,166 +392,6 @@ module Staypuft
                                       }
 
       {
-          'quickstack::nova_network::controller'   => {
-              'amqp_provider'                           => amqp_provider,
-              'ceph_cluster_network'                    => ceph_cluster_network,
-              'ceph_public_network'                     => ceph_public_network,
-              'ceph_fsid'                               => ceph_fsid,
-              'ceph_images_key'                         => ceph_images_key,
-              'ceph_volumes_key'                        => ceph_volumes_key,
-              'ceph_mon_host'                           => ceph_mon_host,
-              'ceph_mon_initial_members'                => ceph_mon_initial_members,
-              'cinder_backend_gluster'                  => cinder_backend_gluster,
-              'cinder_backend_gluster_name'             => cinder_backend_gluster_name,
-              'cinder_backend_iscsi'                    => cinder_backend_iscsi,
-              'cinder_backend_iscsi_name'               => cinder_backend_iscsi_name,
-              'cinder_backend_nfs'                      => cinder_backend_nfs,
-              'cinder_backend_nfs_name'                 => cinder_backend_nfs_name,
-              'cinder_backend_rbd'                      => cinder_backend_rbd,
-              'cinder_backend_rbd_name'                 => cinder_backend_rbd_name,
-              'cinder_backend_eqlx'                     => cinder_backend_eqlx,
-              'cinder_backend_eqlx_name'                => cinder_backend_eqlx_name,
-              'cinder_multiple_backends'                => cinder_multiple_backends,
-              'cinder_create_volume_types'              => cinder_create_volume_types,
-              'cinder_nfs_shares'                       => cinder_nfs_shares,
-              'cinder_nfs_mount_options'                => cinder_nfs_mount_options,
-              'cinder_rbd_pool'                         => cinder_rbd_pool,
-              'cinder_rbd_ceph_conf'                    => cinder_rbd_ceph_conf,
-              'cinder_rbd_flatten_volume_from_snapshot' => cinder_rbd_flatten_volume_from_snapshot,
-              'cinder_rbd_max_clone_depth'              => cinder_rbd_max_clone_depth,
-              'cinder_rbd_user'                         => cinder_rbd_user,
-              'cinder_rbd_secret_uuid'                  => cinder_rbd_secret_uuid,
-              'cinder_san_ip'                           => cinder_san_ip,
-              'cinder_san_login'                        => cinder_san_login,
-              'cinder_san_password'                     => cinder_san_password,
-              'cinder_san_thin_provision'               => cinder_san_thin_provision,
-              'cinder_eqlx_group_name'                  => cinder_eqlx_group_name,
-              'cinder_eqlx_pool'                        => cinder_eqlx_pool,
-              'cinder_eqlx_use_chap'                    => cinder_eqlx_use_chap,
-              'cinder_eqlx_chap_login'                  => cinder_eqlx_chap_login,
-              'cinder_eqlx_chap_password'               => cinder_eqlx_chap_password,
-              'glance_backend'                          => backend,
-              'glance_rbd_store_user'                   => glance_rbd_store_user,
-              'glance_rbd_store_pool'                   => glance_rbd_store_pool,
-              'keystonerc'                              => keystonerc,
-              'admin_password'                          => admin_pw,
-              'ceilometer_user_password'                => ceilometer_user_pw,
-              'cinder_db_password'                      => cinder_db_pw,
-              'cinder_user_password'                    => cinder_user_pw,
-              'glance_db_password'                      => glance_db_pw,
-              'glance_user_password'                    => glance_user_pw,
-              'heat_db_password'                        => heat_db_pw,
-              'heat_user_password'                      => heat_user_pw,
-              'keystone_db_password'                    => keystone_db_pw,
-              'mysql_root_password'                     => mysql_root_pw,
-              'nova_db_password'                        => nova_db_pw,
-              'nova_user_password'                      => nova_user_pw,
-              'swift_admin_password'                    => swift_admin_pw,
-              'amqp_password'                           => amqp_pw,
-              'amqp_nssdb_password'                     => amqp_nssdb_pw,
-              'keystone_admin_token'                    => keystone_admin_token,
-              'ceilometer_metering_secret'              => ceilometer_metering,
-              'heat_auth_encrypt_key'                   => heat_auth_encrypt_key,
-              'horizon_secret_key'                      => horizon_secret_key,
-              'amqp_host'                               => amqp_host,
-              'mysql_host'                              => mysql_host,
-              'swift_shared_secret'                     => swift_shared_secret,
-              'swift_ringserver_ip'                     => '',
-              'swift_storage_ips'                       => { :array => "<%= @host.deployment.network_query.controller_ips('#{Staypuft::SubnetType::MANAGEMENT}') %>" },
-              'cinder_gluster_shares'                   => [],
-              'controller_admin_host'                   => controller_admin_host,
-              'controller_priv_host'                    => controller_priv_host,
-              'controller_pub_host'                     => controller_pub_host },
-          'quickstack::neutron::controller'        => {
-              'amqp_provider'                           => amqp_provider,
-              'ceph_cluster_network'                    => ceph_cluster_network,
-              'ceph_public_network'                     => ceph_public_network,
-              'ceph_fsid'                               => ceph_fsid,
-              'ceph_images_key'                         => ceph_images_key,
-              'ceph_volumes_key'                        => ceph_volumes_key,
-              'ceph_mon_host'                           => ceph_mon_host,
-              'ceph_mon_initial_members'                => ceph_mon_initial_members,
-              'tenant_network_type'                     => tenant_network_type,
-              'ml2_network_vlan_ranges'                 => ml2_network_vlan_ranges,
-              'ml2_tenant_network_types'                => ml2_tenant_network_types,
-              'ml2_tunnel_id_ranges'                    => ml2_tunnel_id_ranges,
-              'ml2_vni_ranges'                          => ml2_vni_ranges,
-              'ml2_mechanism_drivers'                   => ml2_mechanism_drivers,
-              'ovs_vlan_ranges'                         => ovs_vlan_ranges,
-              'enable_tunneling'                        => enable_tunneling,
-              'cinder_backend_gluster'                  => cinder_backend_gluster,
-              'cinder_backend_gluster_name'             => cinder_backend_gluster_name,
-              'cinder_backend_iscsi'                    => cinder_backend_iscsi,
-              'cinder_backend_iscsi_name'               => cinder_backend_iscsi_name,
-              'cinder_backend_nfs'                      => cinder_backend_nfs,
-              'cinder_backend_nfs_name'                 => cinder_backend_nfs_name,
-              'cinder_backend_rbd'                      => cinder_backend_rbd,
-              'cinder_backend_rbd_name'                 => cinder_backend_rbd_name,
-              'cinder_backend_eqlx'                     => cinder_backend_eqlx,
-              'cinder_backend_eqlx_name'                => cinder_backend_eqlx_name,
-              'cinder_multiple_backends'                => cinder_multiple_backends,
-              'cinder_create_volume_types'              => cinder_create_volume_types,
-              'cinder_nfs_shares'                       => cinder_nfs_shares,
-              'cinder_nfs_mount_options'                => cinder_nfs_mount_options,
-              'cinder_rbd_pool'                         => cinder_rbd_pool,
-              'cinder_rbd_ceph_conf'                    => cinder_rbd_ceph_conf,
-              'cinder_rbd_flatten_volume_from_snapshot' => cinder_rbd_flatten_volume_from_snapshot,
-              'cinder_rbd_max_clone_depth'              => cinder_rbd_max_clone_depth,
-              'cinder_rbd_user'                         => cinder_rbd_user,
-              'cinder_rbd_secret_uuid'                  => cinder_rbd_secret_uuid,
-              'cinder_san_ip'                           => cinder_san_ip,
-              'cinder_san_login'                        => cinder_san_login,
-              'cinder_san_password'                     => cinder_san_password,
-              'cinder_san_thin_provision'               => cinder_san_thin_provision,
-              'cinder_eqlx_group_name'                  => cinder_eqlx_group_name,
-              'cinder_eqlx_pool'                        => cinder_eqlx_pool,
-              'cinder_eqlx_use_chap'                    => cinder_eqlx_use_chap,
-              'cinder_eqlx_chap_login'                  => cinder_eqlx_chap_login,
-              'cinder_eqlx_chap_password'               => cinder_eqlx_chap_password,
-              'glance_backend'                          => backend,
-              'glance_rbd_store_user'                   => glance_rbd_store_user,
-              'glance_rbd_store_pool'                   => glance_rbd_store_pool,
-              'keystonerc'                              => keystonerc,
-              'admin_password'                          => admin_pw,
-              'ceilometer_user_password'                => ceilometer_user_pw,
-              'cinder_db_password'                      => cinder_db_pw,
-              'cinder_user_password'                    => cinder_user_pw,
-              'glance_db_password'                      => glance_db_pw,
-              'glance_user_password'                    => glance_user_pw,
-              'heat_db_password'                        => heat_db_pw,
-              'heat_user_password'                      => heat_user_pw,
-              'keystone_db_password'                    => keystone_db_pw,
-              'mysql_root_password'                     => mysql_root_pw,
-              'neutron_db_password'                     => neutron_db_pw,
-              'neutron_user_password'                   => neutron_user_pw,
-              'nova_db_password'                        => nova_db_pw,
-              'nova_user_password'                      => nova_user_pw,
-              'swift_admin_password'                    => swift_admin_pw,
-              'amqp_password'                           => amqp_pw,
-              'amqp_nssdb_password'                     => amqp_nssdb_pw,
-              'keystone_admin_token'                    => keystone_admin_token,
-              'ceilometer_metering_secret'              => ceilometer_metering,
-              'heat_auth_encrypt_key'                   => heat_auth_encrypt_key,
-              'horizon_secret_key'                      => horizon_secret_key,
-              'swift_shared_secret'                     => swift_shared_secret,
-              'neutron_metadata_proxy_secret'           => neutron_metadata_proxy_secret,
-              'amqp_host'                               => amqp_host,
-              'mysql_host'                              => mysql_host,
-              'swift_shared_secret'                     => swift_shared_secret,
-              'swift_ringserver_ip'                     => '',
-              'swift_storage_ips'                       => { :array => "<%= @host.deployment.network_query.controller_ips('#{Staypuft::SubnetType::MANAGEMENT}') %>" },
-              'cinder_gluster_shares'                   => [],
-              'controller_admin_host'                   => controller_admin_host,
-              'controller_priv_host'                    => controller_priv_host,
-              'controller_pub_host'                     => controller_pub_host,
-              'nexus_config'                            => cisco_nexus_config,
-              'neutron_conf_additional_params'          => neutron_conf_additional_params,
-              'nova_conf_additional_params'             => nova_conf_additional_params,
-              'n1kv_plugin_additional_params'           => n1kv_plugin_additional_params,
-              'n1kv_vsm_ip'                             => n1kv_vsm_ip,
-              'n1kv_vsm_password'                       => n1kv_vsm_password,
-              'security_group_api'                      => neutron_security_group_api,
-              'neutron_core_plugin'                     => neutron_core_plugin_module },
           'quickstack::pacemaker::params'          => {
               'include_swift'                 => 'false',
               'include_neutron'               => neutron,
@@ -658,12 +456,11 @@ module Staypuft
               'swift_public_vip'              => vip_format(:swift_public_vip),
               'private_ip'                    => private_ip,
               'cluster_control_ip'            => { :string => "<%= @host.deployment.network_query.controller_ips('#{Staypuft::SubnetType::MANAGEMENT}').first %>" },
-              'lb_backend_server_addrs'       => { :array => "<%= @host.deployment.network_query.controller_ips('#{Staypuft::SubnetType::MANAGEMENT}') %>" },
-              'lb_backend_server_names'       => { :array => '<%= @host.deployment.network_query.controller_fqdns %>' },
+              'lb_backend_server_addrs'       => { :array => "<%= @host.deployment.network_query.controller_ips('#{Staypuft::SubnetType::CLUSTER_MGMT}') %>" },
+              'lb_backend_server_names'       => { :array => '<%= @host.deployment.network_query.controller_pcmk_shortnames %>' },
               'agent_type'                    => neutron_agent_type,
               'n1kv_plugin_additional_params' => n1kv_plugin_additional_params },
           'quickstack::pacemaker::common'          => {
-              'pacemaker_cluster_members' => { :string => "<%= @host.deployment.network_query.controller_ips('#{Staypuft::SubnetType::CLUSTER_MGMT}').join(' ') %>" },
               'fencing_type'                  => fencing_type,
               'fence_ipmilan_address'         => fence_ipmilan_address,
               'fence_ipmilan_username'        => fence_ipmilan_username,
@@ -691,7 +488,9 @@ module Staypuft
               'n1kv_plugin_additional_params'  => n1kv_plugin_additional_params,
               'n1kv_vsm_ip'                    => n1kv_vsm_ip,
               'n1kv_vsm_password'              => n1kv_vsm_password,
-              'security_group_api'             => neutron_security_group_api },
+              'security_group_api'             => neutron_security_group_api,
+              'network_device_mtu'             => neutron_network_device_mtu,
+            },
           'quickstack::pacemaker::glance'          => {
               'backend'         => backend,
               'pcmk_fs_type'    => pcmk_fs_type,
@@ -727,7 +526,8 @@ module Staypuft
           'quickstack::pacemaker::keystone'        => {
               'keystonerc'     => keystonerc,
               'admin_password' => admin_pw,
-              'admin_token'    => keystone_admin_token },
+              'admin_token'    => keystone_admin_token,
+              'ceilometer'     => "false" },
           'quickstack::pacemaker::horizon'         => {
               'secret_key' => horizon_secret_key },
           'quickstack::pacemaker::galera'          => {
@@ -739,25 +539,6 @@ module Staypuft
           'quickstack::pacemaker::nova'            => {
               'multi_host'                    => 'true',
               'neutron_metadata_proxy_secret' => neutron_metadata_proxy_secret },
-          'quickstack::neutron::networker'         => {
-              'amqp_provider'                 => amqp_provider,
-              'enable_tunneling'              => enable_tunneling,
-              'tenant_network_type'           => tenant_network_type,
-              'ovs_bridge_mappings'           => ovs_bridge_mappings,
-              'ovs_bridge_uplinks'            => ovs_bridge_uplinks,
-              'ovs_tunnel_iface'              => ovs_tunnel_iface,
-              'ovs_tunnel_types'              => ovs_tunnel_types,
-              'ovs_vlan_ranges'               => ovs_vlan_ranges,
-              'neutron_db_password'           => neutron_db_pw,
-              'neutron_user_password'         => neutron_user_pw,
-              'nova_db_password'              => nova_db_pw,
-              'nova_user_password'            => nova_user_pw,
-              'amqp_password'                 => amqp_pw,
-              'neutron_metadata_proxy_secret' => neutron_metadata_proxy_secret,
-              'amqp_host'                     => amqp_host,
-              'mysql_host'                    => mysql_host,
-              'controller_priv_host'          => controller_priv_host,
-              'agent_type'                    => neutron_agent_type },
           'quickstack::storage_backend::cinder'    => {
               'amqp_provider'        => amqp_provider,
               'cinder_db_password'   => cinder_db_pw,
@@ -798,7 +579,9 @@ module Staypuft
               'glance_host'                => glance_host,
               'auth_host'                  => auth_host,
               'nova_host'                  => nova_host,
-              'private_ip'                 => private_ip },
+              'private_ip'                 => private_ip,
+              'network_device_mtu'         => nova_network_device_mtu,
+            },
           'quickstack::neutron::compute'           => {
               'amqp_provider'              => amqp_provider,
               'ceilometer'                 => ceilometer,
@@ -836,7 +619,9 @@ module Staypuft
               'nova_host'                  => nova_host,
               'private_ip'                 => private_ip,
               'agent_type'                 => neutron_agent_type,
-              'security_group_api'         => neutron_security_group_api },
+              'security_group_api'         => neutron_security_group_api,
+              'network_device_mtu'         => neutron_network_device_mtu,
+            },
           'quickstack::pacemaker::rsync::keystone' => {
               'keystone_private_vip' => vip_format(:keystone) },
           'quickstack::ceph::config' => {
@@ -849,6 +634,9 @@ module Staypuft
               'volumes_key'                => ceph_volumes_key,
               'osd_pool_default_size'      => ceph_osd_pool_size,
               'osd_journal_size'           => ceph_osd_journal_size
+          },
+          'quickstack::pacemaker::ceilometer' => {
+              'ceilometer_metering_secret' => ceilometer_metering,
           }
       }
     end