Code cleanup & Minor changes

examples/common.yaml

@@ -129,7 +129,7 @@ iaas::profile::neutron::common::service_plugins:
 iaas::profile::heat::password: heat
 iaas::profile::heat::encryption_key: 12345678912345678912345678912345 # https://bugs.launchpad.net/heat/+bug/1415887: "AES key must be either 16, 24, or 32 bytes long"
 
-# Heat
+# Horizon
 iaas::profile::horizon::secret: horizon
 
 # Ceilometer

manifests/profile/base.pp

@@ -5,8 +5,9 @@ class iaas::profile::base (
   $ntp_servers,
 ) {
   # Keep-alive values
-  sysctl { 'net.ipv4.tcp_keepalive_time': value => '30' }
-  sysctl { 'net.ipv4.tcp_keepalive_intvl': value => '15' }
+  sysctl { 'net.ipv4.tcp_keepalive_time': value => '5' }
+  sysctl { 'net.ipv4.tcp_keepalive_probes': value => '5' }
+  sysctl { 'net.ipv4.tcp_keepalive_intvl': value => '1' }
 
   # Ubuntu repository for OpenStack Juno
   apt::source { 'ubuntu-cloud-archive':

manifests/profile/keystone.pp

@@ -39,6 +39,7 @@ class iaas::profile::keystone (
     ports => '35357',
     options => 'check inter 2000 rise 2 fall 5',
   }
+
   @@haproxy::balancermember { "keystone_public_internal_cluster_${::fqdn}":
     listening_service => 'keystone_public_internal_cluster',
     server_names => $::hostname,

manifests/profile/neutron/server.pp

@@ -38,7 +38,7 @@ class iaas::profile::neutron::server (
     nova_url => "http://${endpoint}:8774/v2",
     nova_admin_auth_url => "http://${endpoint}:35357/v2.0",
     nova_admin_password => $nova_password,
-    nova_region_name    => $region,
+    nova_region_name => $region,
   }
 
   @@haproxy::balancermember { "neutron_api_${::fqdn}":

manifests/profile/rabbitmq.pp

@@ -25,7 +25,6 @@ class iaas::profile::rabbitmq (
   rabbitmq_user { $user:
     admin => true,
     password => $password,
-    provider => 'rabbitmqctl',
   } ->
   rabbitmq_user_permissions { "${user}@/":
     configure_permission => '.*',

manifests/profile/tempest.pp

@@ -26,40 +26,6 @@ class iaas::profile::tempest (
     ensure => present,
   }
 
-  ########################################################################
-  class { '::neutron':
-    allow_overlapping_ips => true,
-    rabbit_host => $endpoint,
-    rabbit_user => $rabbitmq_user,
-    rabbit_password => $rabbitmq_password,
-  }
-
-  class { '::neutron::keystone::auth':
-    password => $neutron_password,
-    public_address => $endpoint,
-    admin_address => $endpoint,
-    internal_address => $endpoint,
-    region => $region,
-  }
-
-  class { '::neutron::server':
-    auth_uri => "http://${endpoint}:5000/v2.0",
-    identity_uri => "http://${endpoint}:35357",
-    auth_password       => $neutron_password,
-    enabled             => false,
-    sync_db             => false,
-    mysql_module        => '2.3',
-  }
-  ########################################################################
-
-  class { '::glance::api':
-    keystone_password => $glance_password,
-    auth_uri => "http://${endpoint}:5000/v2.0",
-    identity_uri => "http://${endpoint}:35357",
-    registry_host => $endpoint,
-    os_region_name => $region,
-  }
-
   class { '::tempest':
     setup_venv => true,
     tempest_repo_revision => 'master',
@@ -72,7 +38,7 @@ class iaas::profile::tempest (
     nova_available => true,
     swift_available => false,
     ceilometer_available => true,
-    
+
     configure_images => true,
     image_ref => $image_id,
     image_ref_alt => $alt_image_id,
@@ -97,7 +63,7 @@ class iaas::profile::tempest (
   }
 
   Tempest_config {
-    path    => $::tempest::tempest_conf,
+    path => $::tempest::tempest_conf,
     require => File[$::tempest::tempest_conf],
   }