openstack
/
fuel-octane
Code Issues Proposed changes

Resolve all current Puppet lint warnings 

Change-Id: I8d1e486fdb25a8d7cf52fdec7b36f7acfa38cbab
This commit is contained in:
Pavel Chechetin 2016-08-30 14:27:48 +03:00
parent f9f18276dd
commit 7aadd4265e
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/puppet/octane_tasks/manifests/dbsync.pp
View File

@ -12,15 +12,15 @@ class octane_tasks::dbsync (
include ::cinder::db::sync
include ::heat::db::sync
if $murano_enabled {
if $octane_tasks::params::murano_enabled {
include ::murano::db::sync
}
if $sahara_enabled {
if $octane_tasks::params::sahara_enabled {
include ::sahara::db::sync
}
if $ironic_enabled {
if $octane_tasks::params::ironic_enabled {
include ::ironic::db::sync
}

2
deployment/puppet/octane_tasks/manifests/migrate_flavor_data_70.pp
View File

@ -5,7 +5,7 @@
class octane_tasks::migrate_flavor_data_70 (
) inherits octane_tasks::params {
if $fuel_version == '7.0' {
if $octane_tasks::params::fuel_version == '7.0' {
exec { 'nova-manage db migrate_flavor_data':
command => 'nova-manage db migrate_flavor_data | grep -q \'0 instances matched query, 0 completed\'',
path => ['/usr/bin', '/usr/sbin', '/bin'],

8
deployment/puppet/octane_tasks/manifests/mysqldump_create.pp
View File

@ -4,25 +4,25 @@
# It dumps, encrypts and compreses DB to a dump.
#
class octane_tasks::mysqldump_create inherits octane_tasks::params {
$password = $nova_hash['db_password']
$password = $octane_tasks::params::nova_hash['db_password']
$compress_and_enc_command = 'gzip | openssl enc -e -aes256 -pass env:PASSWORD -out /var/tmp/dbs.original.sql.gz.enc'
$mysql_args = '--defaults-file=/root/.my.cnf --host localhost --add-drop-database --lock-all-tables'
$os_base_dbs = ['cinder', 'glance', 'heat', 'keystone', 'neutron', 'nova']
if $sahara_enabled {
if $octane_tasks::params::sahara_enabled {
$sahara_db = ['sahara']
} else {
$sahara_db = []
}
if $murano_enabled {
if $octane_tasks::params::murano_enabled {
$murano_db = ['murano']
} else {
$murano_db = []
}
if $ironic_enabled {
if $octane_tasks::params::ironic_enabled {
$ironic_db = ['ironic']
} else {
$ironic_db = []

2
deployment/puppet/octane_tasks/manifests/mysqldump_restore.pp
View File

@ -3,7 +3,7 @@
# It decrypts, decompreses and restores DB dump.
#
class octane_tasks::mysqldump_restore inherits octane_tasks::params {
$password = $nova_hash['db_password']
$password = $octane_tasks::params::nova_hash['db_password']
$dump_path = '/var/tmp/dbs.original.sql.gz.enc'
$restore_command = "openssl enc -d -aes256 -pass env:PASSWORD -in ${dump_path} | gzip -d | mysql --defaults-file=/root/.my.cnf"