x/fuel-plugin-manila
Code Issues Proposed changes

fix a lot of typo and mistakes

Browse Source 
Change-Id: I9668967b8ac4a817fb6dc00de0daeda47d0281ef
This commit is contained in:
Igor Gajsin 2016-08-03 19:51:56 +03:00
parent 04839b9a61
commit 9e79defcd4
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deployment_scripts/puppet/manifests/install.pp
View File

@ -1,10 +1,10 @@
notify {'MODULAR: fuel-plugin-manila/install': } notify {'MODULAR: fuel-plugin-manila/install': }
$manila = hiera_hash('fuel-plugin-manila', {}) $manila = hiera_hash('fuel-plugin-manila', {})
$image = manila['fuel-plugin-manila_image'] $image = $manila['fuel-plugin-manila_image']
$master_ip = hiera('master_ip') $master_ip = hiera('master_ip')
$src_image = "wget http://${master_ip}:8080/plugins/fuel-plugin-manila-1.0/repositories/ubuntu/${image}" $src_image = "http://${master_ip}:8080/plugins/fuel-plugin-manila-1.0/repositories/ubuntu/${image}"
$inits = { $inits = {
'manila-api' => { 'manila-api' => {
desc => 'manila-api init', desc => 'manila-api init',
@ -46,7 +46,8 @@ class {'::manila_auxiliary::fs': }
create_resources('::manila_auxiliary::initd', $inits) create_resources('::manila_auxiliary::initd', $inits)
class {'::manila_auxiliary::image': class {'::manila_auxiliary::image':
image => $image src_image => $src_image,
image => $image,
} }
Package['python-pip']->Package['pycrypto']->Package['python-manila']->Package['python-manilaclient']->Package['python-manila-ui'] Package['python-pip']->Package['pycrypto']->Package['python-manila']->Package['python-manilaclient']->Package['python-manila-ui']

4
deployment_scripts/puppet/manifests/populate_hiera.pp
View File

@ -1,11 +1,11 @@
notify {'MODULAR: fuel-plugin-manila/populate_hiera': } notify {'MODULAR: fuel-plugin-manila/populate_hiera': }
$manila = hiera_hash('manila', {}) $manila = hiera_hash('manila', false)
$fpg_manila = hiera_hash('fuel-plugin-manila', {}) $fpg_manila = hiera_hash('fuel-plugin-manila', {})
$file = '/etc/hiera/plugins/fuel-plugin-manila.yaml' $file = '/etc/hiera/plugins/fuel-plugin-manila.yaml'
$new_password = generate("/bin/bash", "-c", "/bin/date +%s | sha256sum | base64 | head -c 32 ; echo -n") $new_password = generate("/bin/bash", "-c", "/bin/date +%s | sha256sum | base64 | head -c 32 ; echo -n")
$db_password = generate("/bin/bash", "-c", "sleep1; /bin/date +%s | sha256sum | base64 | head -c 32 ; echo -n") $db_password = generate("/bin/bash", "-c", "sleep 1; /bin/date +%s | sha256sum | base64 | head -c 32 ; echo -n")
$image_name = 'manila-service-image' $image_name = 'manila-service-image'
$service_image = $fpg_manila['fuel-plugin-manila_image'] $service_image = $fpg_manila['fuel-plugin-manila_image']

4
deployment_scripts/puppet/modules/manila_auxiliary/manifests/image.pp
View File

@ -7,7 +7,7 @@ class manila_auxiliary::image (
source => 'puppet:///modules/manila_auxiliary/upload_cirros.rb', source => 'puppet:///modules/manila_auxiliary/upload_cirros.rb',
}-> }->
exec {'wget_service_image': exec {'wget_service_image':
command => "wget ${src_image} -O /tmp/${image}" command => "wget ${src_image} -O /tmp/${image}",
path => '/usr/bin', path => '/usr/bin',
}-> }->
exec {'upload-service-image': exec {'upload-service-image':
@ -15,7 +15,7 @@ class manila_auxiliary::image (
path => '/usr/bin', path => '/usr/bin',
}-> }->
exec {'del_service_image': exec {'del_service_image':
command => "rm /tmp/${image}", command => "/bin/rm /tmp/${image}",
path => '/usr/bin', path => '/usr/bin',
} }
} }