openstack
/
fuel-library
Code Issues Proposed changes

Merge "Disable execution of dbsync for Murano Dashboard" into stable/8.0

This commit is contained in:
Jenkins 2016-01-20 14:34:38 +00:00 committed by Gerrit Code Review
parent 6bb8e85b37 e1e5cff591
commit 9065f3ac7e
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/Puppetfile
View File

@ -184,7 +184,7 @@ mod 'ironic',
# Pull in puppet-murano
mod 'murano',
:git => 'https://review.fuel-infra.org/p/puppet-modules/puppet-murano.git',
:ref => '7.0.0-rc4'
:ref => '7.0.0-rc5'
# Pull in richardc-datacat
mod 'datacat',

1
deployment/puppet/osnailyfacter/modular/murano/murano.pp
View File

@ -139,6 +139,7 @@ if $murano_hash['enabled'] {
class { 'murano::dashboard':
repo_url => $repository_url,
sync_db => false,
}
if $murano_plugins and $murano_plugins['glance_artifacts_plugin'] and $murano_plugins['glance_artifacts_plugin']['enabled'] {

6
tests/noop/spec/hosts/murano/murano_spec.rb
View File

@ -178,13 +178,15 @@ describe manifest do
it 'should declare murano::dashboard class correctly' do
should contain_class('murano::dashboard').with(
'api_url' => nil,
'repo_url' => repository_url
'api_url' => nil,
'repo_url' => repository_url,
'sync_db' => false,
)
end
it { should_not contain_concat__fragment('murano_dashboard_section').with_content(/MURANO_API_URL = /)}
it { should contain_concat__fragment('murano_dashboard_section').with_content(/METADATA_CACHE_DIR = '\/var\/cache\/murano-dashboard'/)}
it { should_not contain_exec('django_syncdb') }
enable = (Noop.hiera_structure('murano/enabled') and Noop.hiera('node_role') == 'primary-controller')