Merge "Change Amphora flavor from public to private"
This commit is contained in:
commit
79a4f07904
@ -107,11 +107,12 @@ class octavia::worker (
|
||||
if $manage_nova_flavor {
|
||||
$octavia_flavor = { "octavia_${amp_flavor_id}" => { 'id' => $amp_flavor_id } }
|
||||
$octavia_flavor_defaults = {
|
||||
'ensure' => 'present',
|
||||
'ram' => '1024',
|
||||
'disk' => '2',
|
||||
'vcpus' => '1',
|
||||
'tag' => ['octavia']
|
||||
'ensure' => 'present',
|
||||
'ram' => '1024',
|
||||
'disk' => '2',
|
||||
'vcpus' => '1',
|
||||
'is_public' => false,
|
||||
'tag' => ['octavia']
|
||||
}
|
||||
$nova_flavor_defaults = merge($octavia_flavor_defaults, $nova_flavor_config)
|
||||
create_resources('nova_flavor', $octavia_flavor, $nova_flavor_defaults)
|
||||
|
@ -0,0 +1,3 @@
|
||||
---
|
||||
fixes:
|
||||
- Change amphora flavor is_public property from true to false.
|
@ -57,12 +57,13 @@ describe 'octavia::worker' do
|
||||
|
||||
it 'deploys nova flavor for octavia worker' do
|
||||
is_expected.to contain_nova_flavor('octavia_65').with(
|
||||
:ensure => 'present',
|
||||
:id => '65',
|
||||
:ram => '1024',
|
||||
:disk => '2',
|
||||
:vcpus => '1',
|
||||
:tag => ['octavia'],
|
||||
:ensure => 'present',
|
||||
:id => '65',
|
||||
:ram => '1024',
|
||||
:disk => '2',
|
||||
:vcpus => '1',
|
||||
:is_public => false,
|
||||
:tag => ['octavia'],
|
||||
)
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user