From 862d0499851d75d3711c3429fecfe2a99df69236 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 11 May 2015 17:31:57 -0400 Subject: [PATCH] compute: do not manage nova db sync in this module Nova DB sync is already managed by puppet-nova so to avoid race condition when deploying Nova, we should drop the nova_db_sync exec in this module and let puppet-nova does it job with the right orchestration. Change-Id: Ia4d93cf84accd10a22b33f03e041d0c23aecca38 Closes-bug: #1453968 --- manifests/compute.pp | 13 ------------- spec/classes/cloud_compute_api_spec.rb | 9 --------- spec/classes/cloud_compute_cert_spec.rb | 9 --------- spec/classes/cloud_compute_conductor_spec.rb | 9 --------- spec/classes/cloud_compute_consoleauth_spec.rb | 9 --------- spec/classes/cloud_compute_consoleproxy_spec.rb | 9 --------- spec/classes/cloud_compute_hypervisor_spec.rb | 9 --------- spec/classes/cloud_compute_scheduler_spec.rb | 9 --------- 8 files changed, 76 deletions(-) diff --git a/manifests/compute.pp b/manifests/compute.pp index 1a1d391f..00360c1e 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -191,17 +191,4 @@ class cloud::compute( 'DEFAULT/cinder_catalog_info': value => "volume:cinder:${cinder_endpoint_type}"; } - # Note(EmilienM): - # We check if DB tables are created, if not we populate Nova DB. - # It's a hack to fit with our setup where we run MySQL/Galera - # TODO(Goneri) - # We have to do this only on the primary node of the galera cluster to avoid race condition - # https://github.com/enovance/puppet-openstack-cloud/issues/156 - exec {'nova_db_sync': - command => 'nova-manage db sync', - user => 'nova', - path => '/usr/bin', - unless => "/usr/bin/mysql nova -h ${nova_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | /bin/grep Tables" - } - } diff --git a/spec/classes/cloud_compute_api_spec.rb b/spec/classes/cloud_compute_api_spec.rb index 3e4c0735..81ae4ab1 100644 --- a/spec/classes/cloud_compute_api_spec.rb +++ b/spec/classes/cloud_compute_api_spec.rb @@ -106,15 +106,6 @@ describe 'cloud::compute::api' do ) end - it 'checks if Nova DB is populated' do - is_expected.to contain_exec('nova_db_sync').with( - :command => 'nova-manage db sync', - :user => 'nova', - :path => '/usr/bin', - :unless => '/usr/bin/mysql nova -h 10.0.0.1 -u nova -psecrete -e "show tables" | /bin/grep Tables' - ) - end - it 'configure nova-api' do is_expected.to contain_class('nova::api').with( :enabled => true, diff --git a/spec/classes/cloud_compute_cert_spec.rb b/spec/classes/cloud_compute_cert_spec.rb index 71659be6..20d042e3 100644 --- a/spec/classes/cloud_compute_cert_spec.rb +++ b/spec/classes/cloud_compute_cert_spec.rb @@ -76,15 +76,6 @@ describe 'cloud::compute::cert' do ) end - it 'checks if Nova DB is populated' do - is_expected.to contain_exec('nova_db_sync').with( - :command => 'nova-manage db sync', - :user => 'nova', - :path => '/usr/bin', - :unless => '/usr/bin/mysql nova -h 10.0.0.1 -u nova -psecrete -e "show tables" | /bin/grep Tables' - ) - end - it 'configure nova-cert' do is_expected.to contain_class('nova::cert').with(:enabled => true) end diff --git a/spec/classes/cloud_compute_conductor_spec.rb b/spec/classes/cloud_compute_conductor_spec.rb index 0c061b75..95991d07 100644 --- a/spec/classes/cloud_compute_conductor_spec.rb +++ b/spec/classes/cloud_compute_conductor_spec.rb @@ -76,15 +76,6 @@ describe 'cloud::compute::conductor' do ) end - it 'checks if Nova DB is populated' do - is_expected.to contain_exec('nova_db_sync').with( - :command => 'nova-manage db sync', - :user => 'nova', - :path => '/usr/bin', - :unless => '/usr/bin/mysql nova -h 10.0.0.1 -u nova -psecrete -e "show tables" | /bin/grep Tables' - ) - end - it 'configure nova-conductor' do is_expected.to contain_class('nova::conductor').with(:enabled => true) end diff --git a/spec/classes/cloud_compute_consoleauth_spec.rb b/spec/classes/cloud_compute_consoleauth_spec.rb index 66d3c5ca..a1bfc5ea 100644 --- a/spec/classes/cloud_compute_consoleauth_spec.rb +++ b/spec/classes/cloud_compute_consoleauth_spec.rb @@ -76,15 +76,6 @@ describe 'cloud::compute::consoleauth' do ) end - it 'checks if Nova DB is populated' do - is_expected.to contain_exec('nova_db_sync').with( - :command => 'nova-manage db sync', - :user => 'nova', - :path => '/usr/bin', - :unless => '/usr/bin/mysql nova -h 10.0.0.1 -u nova -psecrete -e "show tables" | /bin/grep Tables' - ) - end - it 'configure nova-consoleauth' do is_expected.to contain_class('nova::consoleauth').with(:enabled => true) end diff --git a/spec/classes/cloud_compute_consoleproxy_spec.rb b/spec/classes/cloud_compute_consoleproxy_spec.rb index f4bbacaf..f1d73610 100644 --- a/spec/classes/cloud_compute_consoleproxy_spec.rb +++ b/spec/classes/cloud_compute_consoleproxy_spec.rb @@ -80,15 +80,6 @@ describe 'cloud::compute::consoleproxy' do ) end - it 'checks if Nova DB is populated' do - is_expected.to contain_exec('nova_db_sync').with( - :command => 'nova-manage db sync', - :user => 'nova', - :path => '/usr/bin', - :unless => '/usr/bin/mysql nova -h 10.0.0.1 -u nova -psecrete -e "show tables" | /bin/grep Tables' - ) - end - it 'configure nova-vncproxy' do is_expected.to contain_class('nova::vncproxy').with( :enabled => true, diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb index 2f6c74cb..7ed80f0a 100644 --- a/spec/classes/cloud_compute_hypervisor_spec.rb +++ b/spec/classes/cloud_compute_hypervisor_spec.rb @@ -175,15 +175,6 @@ describe 'cloud::compute::hypervisor' do ) end - it 'checks if Nova DB is populated' do - is_expected.to contain_exec('nova_db_sync').with( - :command => 'nova-manage db sync', - :path => '/usr/bin', - :user => 'nova', - :unless => '/usr/bin/mysql nova -h 10.0.0.1 -u nova -psecrete -e "show tables" | /bin/grep Tables' - ) - end - it 'configure nova-compute' do is_expected.to contain_class('nova::compute').with( :enabled => true, diff --git a/spec/classes/cloud_compute_scheduler_spec.rb b/spec/classes/cloud_compute_scheduler_spec.rb index e35e0d34..a310cf22 100644 --- a/spec/classes/cloud_compute_scheduler_spec.rb +++ b/spec/classes/cloud_compute_scheduler_spec.rb @@ -82,15 +82,6 @@ describe 'cloud::compute::scheduler' do ) end - it 'checks if Nova DB is populated' do - is_expected.to contain_exec('nova_db_sync').with( - :command => 'nova-manage db sync', - :user => 'nova', - :path => '/usr/bin', - :unless => '/usr/bin/mysql nova -h 10.0.0.1 -u nova -psecrete -e "show tables" | /bin/grep Tables' - ) - end - it 'configure nova-scheduler' do is_expected.to contain_class('nova::scheduler').with(:enabled => true) end