Merge pull request #424 from enovance/update-modules

Update puppet-nova & puppet-keystone to use last stable/havana

.fixtures.yml

@@ -5,10 +5,10 @@ fixtures:
       ref: 'bd1536626f2b5d66f9ea77bcd69ba7d1f5f33961'
     'keystone':
       repo: 'git://github.com/enovance/puppet-keystone.git'
-      ref: '9802add6566646dc1e4a2812d19c2ab4724ff594'
+      ref: 'ce49f6b6d9bb0e89e3e1e63a88a1d63d5a930851'
     'nova':
       repo: 'git://github.com/enovance/puppet-nova.git'
-      ref: '7f92da6e5897f7facc8d0b6505f129d77353439e'
+      ref: 'b7811392062b649572f470f5f3ddca1882997210'
     'glance':
       repo: 'git://github.com/enovance/puppet-glance.git'
       ref: '001f1b6a8ef6bd0fde8fbe0a4b3362f31e6bbcda'

Puppetfile

@@ -34,13 +34,13 @@ mod 'horizon',
   :ref => 'd9e93ff61574660fa26f88e3a72d4ce9322b424a'
 mod 'keystone',
   :git => 'git://github.com/enovance/puppet-keystone.git',
-  :ref => '9802add6566646dc1e4a2812d19c2ab4724ff594'
+  :ref => 'ce49f6b6d9bb0e89e3e1e63a88a1d63d5a930851'
 mod 'neutron',
   :git => 'git://github.com/enovance/puppet-neutron.git',
   :ref => '39b7efdbc83c65966b7a961df98561c5550c2d23'
 mod 'nova',
   :git => 'git://github.com/enovance/puppet-nova.git',
-  :ref => '7f92da6e5897f7facc8d0b6505f129d77353439e'
+  :ref => 'b7811392062b649572f470f5f3ddca1882997210'
 mod 'swift',
   :git => 'git://github.com/enovance/puppet-swift.git',
   :ref => '9b60581a1c8fd2c1a98adafc1bcdc53796859e23'

manifests/identity.pp

@@ -400,19 +400,17 @@ class cloud::identity (
   $ks_token_expiration          = $os_params::ks_token_expiration,
 ){
 
-  # Disable twice logging if syslog is enabled
-  if $use_syslog {
-    $log_dir = false
-    keystone_config {
-      'DEFAULT/log_file': ensure => absent;
-    }
-  } else {
-    $log_dir = '/var/log/keystone'
-  }
-
   $encoded_user     = uriescape($keystone_db_user)
   $encoded_password = uriescape($keystone_db_password)
 
+  if $use_syslog {
+    $log_dir  = false
+    $log_file = false
+  } else {
+    $log_dir  = '/var/log/keystone'
+    $log_file = 'keystone.log'
+  }
+
 # Configure Keystone
   class { 'keystone':
     enabled          => true,
@@ -427,6 +425,7 @@ class cloud::identity (
     verbose          => $verbose,
     bind_host        => $api_eth,
     log_dir          => $log_dir,
+    log_file         => $log_file,
     public_port      => $ks_keystone_public_port,
     admin_port       => $ks_keystone_admin_port,
     token_driver     => $token_driver,

spec/classes/cloud_compute_hypervisor_spec.rb

@@ -157,6 +157,7 @@ describe 'cloud::compute::hypervisor' do
           :network_vlan_ranges    => ['physnet1:1000:2999'],
           :enable_security_group  => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
       )
+      should contain_kmod__install(platform_params[:gre_module_name])
     end
 
     it 'configure neutron on compute node' do
@@ -206,14 +207,6 @@ describe 'cloud::compute::hypervisor' do
         )
     end
 
-    it 'should create neutron modprobe configuration file' do
-      should contain_file('/etc/modprobe.d/neutron.conf').with(
-        :owner => 'root',
-        :group => 'root',
-        :mode  => '0644'
-      )
-    end
-
     it 'configure spice console' do
       should contain_class('nova::compute::spice').with(
           :server_listen              => '0.0.0.0',
@@ -304,6 +297,10 @@ describe 'cloud::compute::hypervisor' do
       }
     end
 
+    let :platform_params do
+      { :gre_module_name => 'gre' }
+    end
+
     it_configures 'openstack compute hypervisor'
   end
 
@@ -314,6 +311,10 @@ describe 'cloud::compute::hypervisor' do
       }
     end
 
+    let :platform_params do
+      { :gre_module_name => 'ip_gre' }
+    end
+
     it_configures 'openstack compute hypervisor'
   end
 

spec/classes/cloud_identity_spec.rb

@@ -110,10 +110,12 @@ describe 'cloud::identity' do
         :public_port         => '5000',
         :admin_port          => '35357',
         :token_expiration    => '3600',
-        :log_dir             => false
+        :log_dir             => false,
+        :log_file            => false
       )
       should contain_keystone_config('ec2/driver').with('value' => 'keystone.contrib.ec2.backends.sql.Ec2')
       should contain_keystone_config('DEFAULT/log_file').with_ensure('absent')
+      should contain_keystone_config('DEFAULT/log_dir').with_ensure('absent')
     end
 
     it 'checks if Keystone DB is populated' do
@@ -259,6 +261,19 @@ describe 'cloud::identity' do
       )
     end
 
+    context 'without syslog' do
+      before :each do
+        params.merge!(:use_syslog => false)
+      end
+      it 'configure keystone server' do
+        should contain_class('keystone').with(
+          :use_syslog          => false,
+          :log_dir             => '/var/log/keystone',
+          :log_file            => 'keystone.log'
+        )
+      end
+    end
+
     context 'without Swift' do
       before :each do
         params.merge!(:swift_enabled => false)