openstack/puppet-murano
Code Issues Proposed changes

Remove deprecated parameters

Browse Source 
Those parameters was deprecated in begining and middle of Mitaka
cycle hence we can remove them.

Change-Id: I5ff106ba136994631c9eb69111a0b641891c9bb1
This commit is contained in:
Denis Egorenko 2016-06-22 20:46:01 +03:00
parent 62e190da5a
commit a76fe7ce10
5 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/api.pp
View File

@ -24,28 +24,17 @@
# (Optional) Port on which murano api should listen
# Defaults to $::os_service_default.
#
# DEPRECATED PARAMETERS
#
# [*sync_db*]
# (Optional) Whether to sync database
# Defaults to undef
#
class murano::api(
$manage_service = true,
$enabled = true,
$package_ensure = 'present',
$host = $::os_service_default,
$port = $::os_service_default,
$sync_db = undef,
) {
include ::murano::params
include ::murano::policy
if $sync_db {
warning('The sync_db parameter has no effect.')
}
Murano_config<||> ~> Service['murano-api']
Class['murano::policy'] -> Service['murano-api']

11
manifests/dashboard.pp
View File

@ -8,11 +8,6 @@
# (Optional) Ensure state for package
# Defaults to 'present'
#
# [*api_url*]
# (Optional) DEPRECATED: Use murano::keystone::auth to configure keystone::endpoint for Murano API instead
# API url for murano-dashboard
# Defaults to 'undef'
#
# [*repo_url*]
# (Optional) Application repository URL for murano-dashboard
# Defaults to 'undef'
@ -55,16 +50,10 @@ class murano::dashboard(
$dashboard_debug_level = 'DEBUG',
$client_debug_level = 'ERROR',
$sync_db = true,
# DEPRECATED PARAMETERS
$api_url = undef,
) {
include ::murano::params
if $api_url {
warning('Usage of api_url is deprecated. Use murano::keystone::auth to configure keystone::endpoint for Murano API instead.')
}
package { 'murano-dashboard':
ensure => $package_ensure,
name => $::murano::params::dashboard_package_name,

11
manifests/engine.pp
View File

@ -20,27 +20,16 @@
# (Optional) Number of workers for Murano Engine
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*sync_db*]
# (Optional) Whether to sync database
# Defaults to undef
#
class murano::engine(
$manage_service = true,
$enabled = true,
$package_ensure = 'present',
$workers = $::os_service_default,
$sync_db = undef,
) {
include ::murano::params
include ::murano::policy
if $sync_db {
warning('The sync_db parameter has no effect.')
}
Murano_config<||> ~> Service['murano-engine']
Class['murano::policy'] -> Service['murano-engine']

2
spec/classes/murano_dashboard_spec.rb
View File

@ -52,7 +52,6 @@ describe 'murano::dashboard' do
shared_examples_for 'with parameters override' do
let :params do {
:api_url => 'http://127.0.0.1:8083',
:repo_url => 'http://storage.apps.openstack.com',
:enable_glare => true,
:collect_static_script => '/bin/openstack-dashboard/manage.py',
@ -79,7 +78,6 @@ describe 'murano::dashboard' do
:order => 2,
})}
it { is_expected.to contain_concat__fragment('murano_dashboard_section').with_content(/MURANO_API_URL = 'http:\/\/127.0.0.1:8083'/)}
it { is_expected.to contain_concat__fragment('murano_dashboard_section').with_content(/MURANO_REPO_URL = 'http:\/\/storage.apps.openstack.com'/)}
it { is_expected.to contain_concat__fragment('murano_dashboard_section').with_content(/MAX_FILE_SIZE_MB = '5'/)}
it { is_expected.to contain_concat__fragment('murano_dashboard_section').with_content(/METADATA_CACHE_DIR = '\/tmp\/muranodashboard-cache'/)}

1
templates/local_settings.py.erb
View File

@ -1,5 +1,4 @@
## MURANO_CONFIG_BEGIN ##
<% if @api_url != nil %>MURANO_API_URL = '<%= @api_url %>'<% end %>
<% if @repo_url != nil %>MURANO_REPO_URL = '<%= @repo_url %>'<% end %>
MAX_FILE_SIZE_MB = '<%= @max_file_size %>'
METADATA_CACHE_DIR = '<%= @metadata_dir %>'