From c85d756ddbe8069d6656179d4499d3ba41f6da2d Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 6 May 2014 18:51:38 +0200 Subject: [PATCH] Fix unit tests for Icehouse Signed-off-by: Emilien Macchi --- .fixtures.yml | 4 ++-- Puppetfile | 4 ++-- manifests/identity.pp | 1 - manifests/network/dhcp.pp | 8 +++----- manifests/telemetry/server.pp | 2 +- spec/classes/cloud_compute_controller_spec.rb | 3 +-- spec/classes/cloud_identity_spec.rb | 1 - spec/classes/cloud_network_controller_spec.rb | 2 +- spec/classes/cloud_network_dhcp_spec.rb | 6 +++--- 9 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index d8fb3686..8a14fa97 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -2,7 +2,7 @@ fixtures: repositories: 'cinder': repo: 'git://github.com/enovance/puppet-cinder' - ref: 'c55b95cb7edbaf0afa63e49c19d6d08bb80ab555' + ref: 'eccaa59fb9635c62d108029e797388d456e8f6c2' 'keystone': repo: 'git://github.com/enovance/puppet-keystone.git' ref: '77dbc80de15b5ef02a5e89c8ef040e70df576a1d' @@ -23,7 +23,7 @@ fixtures: ref: '66c436bc2f06c5a71d79c674697394a11ec227f9' 'ceilometer': repo: 'git://github.com/enovance/puppet-ceilometer' - ref: 'a914270e284e050f0d1ce94b646c9e742f28c059' + ref: '615b6463ba04af34b810a358e106da25f208b080' 'heat': repo: 'git://github.com/enovance/puppet-heat' ref: '17736b2fd726858cb83590f8a8b1d594a087ea44' diff --git a/Puppetfile b/Puppetfile index c67ac4a0..63d120ef 100644 --- a/Puppetfile +++ b/Puppetfile @@ -19,10 +19,10 @@ forge 'http://forge.puppetlabs.com' # Core OpenStack projects mod 'ceilometer', :git => 'git://github.com/enovance/puppet-ceilometer.git', - :ref => 'a914270e284e050f0d1ce94b646c9e742f28c059' + :ref => '615b6463ba04af34b810a358e106da25f208b080' mod 'cinder', :git => 'git://github.com/enovance/puppet-cinder.git', - :ref => 'c55b95cb7edbaf0afa63e49c19d6d08bb80ab555' + :ref => 'eccaa59fb9635c62d108029e797388d456e8f6c2' mod 'glance', :git => 'git://github.com/enovance/puppet-glance.git', :ref => 'f3bbfd9efcc2436d6ed4beca87d62168bb109453' diff --git a/manifests/identity.pp b/manifests/identity.pp index 20c6773e..ae050720 100644 --- a/manifests/identity.pp +++ b/manifests/identity.pp @@ -462,7 +462,6 @@ class cloud::identity ( if $swift_enabled { class {'swift::keystone::auth': - address => $ks_swift_internal_host, password => $ks_swift_password, public_address => $ks_swift_public_host, public_port => $ks_swift_public_port, diff --git a/manifests/network/dhcp.pp b/manifests/network/dhcp.pp index db402130..ef63ff3f 100644 --- a/manifests/network/dhcp.pp +++ b/manifests/network/dhcp.pp @@ -25,13 +25,11 @@ class cloud::network::dhcp( include 'cloud::network' class { 'neutron::agents::dhcp': - debug => $debug + debug => $debug, + dnsmasq_config_file => '/etc/neutron/dnsmasq-neutron.conf', + enable_isolated_metadata => true } - neutron_dhcp_agent_config { - 'DEFAULT/dnsmasq_config_file': value => '/etc/neutron/dnsmasq-neutron.conf'; - 'DEFAULT/enable_isolated_metadata': value => true; - } if $dnsmasq_dns_server { neutron_dhcp_agent_config { 'DEFAULT/dnsmasq_dns_server': value => $dnsmasq_dns_server diff --git a/manifests/telemetry/server.pp b/manifests/telemetry/server.pp index c3487ef4..34175d56 100644 --- a/manifests/telemetry/server.pp +++ b/manifests/telemetry/server.pp @@ -38,6 +38,6 @@ class cloud::telemetry::server( class { 'cloud::telemetry::alarmevaluator': } class { 'cloud::telemetry::alarmnotifier': } class { 'cloud::telemetry::collector': } - class { 'cloud::telemetry::agent::notification': } + class { 'cloud::telemetry::notification': } } diff --git a/spec/classes/cloud_compute_controller_spec.rb b/spec/classes/cloud_compute_controller_spec.rb index eda30b44..5054e5c9 100644 --- a/spec/classes/cloud_compute_controller_spec.rb +++ b/spec/classes/cloud_compute_controller_spec.rb @@ -140,8 +140,7 @@ describe 'cloud::compute::controller' do let :facts do { :osfamily => 'RedHat' } end - #TODO(sbadia) Wait https://review.openstack.org/#/c/72449/ in stable/havana - #it_configures 'openstack compute controller' + it_configures 'openstack compute controller' end end diff --git a/spec/classes/cloud_identity_spec.rb b/spec/classes/cloud_identity_spec.rb index 23c946a3..04149229 100644 --- a/spec/classes/cloud_identity_spec.rb +++ b/spec/classes/cloud_identity_spec.rb @@ -161,7 +161,6 @@ describe 'cloud::identity' do it 'configure swift endpoints' do should contain_class('swift::keystone::auth').with( - :address => '10.0.0.1', :password => 'secrete', :public_address => '10.0.0.1', :public_port => '8080', diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb index f0d40a45..7e1b6099 100644 --- a/spec/classes/cloud_network_controller_spec.rb +++ b/spec/classes/cloud_network_controller_spec.rb @@ -44,7 +44,7 @@ describe 'cloud::network::controller' do :ks_keystone_admin_host => '10.0.0.1', :ks_keystone_public_port => '5000', :nova_url => 'http://127.0.0.1:8774/v2', - :$nova_admin_auth_url => 'http://127.0.0.1:35357/v2.0', + :nova_admin_auth_url => 'http://127.0.0.1:35357/v2.0', :nova_admin_username => 'nova', :nova_admin_tenant_name => 'services', :nova_admin_password => 'novapassword', diff --git a/spec/classes/cloud_network_dhcp_spec.rb b/spec/classes/cloud_network_dhcp_spec.rb index effa3cf5..f0a4611a 100644 --- a/spec/classes/cloud_network_dhcp_spec.rb +++ b/spec/classes/cloud_network_dhcp_spec.rb @@ -78,11 +78,11 @@ describe 'cloud::network::dhcp' do it 'configure neutron dhcp' do should contain_class('neutron::agents::dhcp').with( - :debug => true + :debug => true, + :dnsmasq_config_file => '/etc/neutron/dnsmasq-neutron.conf', + :enable_isolated_metadata => true ) - should contain_neutron_dhcp_agent_config('DEFAULT/dnsmasq_config_file').with_value('/etc/neutron/dnsmasq-neutron.conf') - should contain_neutron_dhcp_agent_config('DEFAULT/enable_isolated_metadata').with_value(true) should contain_neutron_dhcp_agent_config('DEFAULT/dnsmasq_dns_server').with_ensure('absent') should contain_file('/etc/neutron/dnsmasq-neutron.conf').with(