x/packstack
Code Issues Proposed changes

Merge "Drop redundant nova resource dependencies"

Browse Source
This commit is contained in:
Zuul 2024-10-31 09:25:16 +00:00 committed by Gerrit Code Review
commit f3de962c37
3 changed files with 40 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packstack/puppet/modules/packstack/manifests/manila/backend/generic.pp
View File

@ -21,7 +21,6 @@ class packstack::manila::backend::generic ()
ram => '512', ram => '512',
disk => '1', disk => '1',
vcpus => '1', vcpus => '1',
require => [ Class['::nova::api'], Class['::nova::keystone::auth'] ],
} }
-> manila::backend::service_instance{ 'generic': -> manila::backend::service_instance{ 'generic':
service_image_location => lookup('CONFIG_MANILA_SERVICE_IMAGE_LOCATION'), service_image_location => lookup('CONFIG_MANILA_SERVICE_IMAGE_LOCATION'),

8
packstack/puppet/modules/packstack/manifests/nova/api.pp
View File

@ -78,16 +78,12 @@ class packstack::nova::api ()
$manage_flavors = str2bool(lookup('CONFIG_NOVA_MANAGE_FLAVORS')) $manage_flavors = str2bool(lookup('CONFIG_NOVA_MANAGE_FLAVORS'))
if $manage_flavors { if $manage_flavors {
Class['::nova::api'] -> Nova_flavor<||>
Class['::keystone'] -> Nova_flavor<||>
nova_flavor { 'm1.tiny': nova_flavor { 'm1.tiny':
ensure => present, ensure => present,
id => '1', id => '1',
ram => '512', ram => '512',
disk => '1', disk => '1',
vcpus => '1', vcpus => '1',
require => [ Class['::nova::api'], Class['::nova::keystone::auth'] ],
} }
nova_flavor { 'm1.small': nova_flavor { 'm1.small':
@ -96,7 +92,6 @@ class packstack::nova::api ()
ram => '2048', ram => '2048',
disk => '20', disk => '20',
vcpus => '1', vcpus => '1',
require => [ Class['::nova::api'], Class['::nova::keystone::auth'] ],
} }
nova_flavor { 'm1.medium': nova_flavor { 'm1.medium':
@ -105,7 +100,6 @@ class packstack::nova::api ()
ram => '4096', ram => '4096',
disk => '40', disk => '40',
vcpus => '2', vcpus => '2',
require => [ Class['::nova::api'], Class['::nova::keystone::auth'] ],
} }
nova_flavor { 'm1.large': nova_flavor { 'm1.large':
@ -114,7 +108,6 @@ class packstack::nova::api ()
ram => '8192', ram => '8192',
disk => '80', disk => '80',
vcpus => '4', vcpus => '4',
require => [ Class['::nova::api'], Class['::nova::keystone::auth'] ],
} }
nova_flavor { 'm1.xlarge': nova_flavor { 'm1.xlarge':
@ -123,7 +116,6 @@ class packstack::nova::api ()
ram => '16384', ram => '16384',
disk => '160', disk => '160',
vcpus => '8', vcpus => '8',
require => [ Class['::nova::api'], Class['::nova::keystone::auth'] ],
} }
} }
} }

2
packstack/puppet/modules/packstack/manifests/provision/tempest.pp
View File

@ -67,7 +67,6 @@ class packstack::provision::tempest ()
ram => $tempest_flavor_ram, ram => $tempest_flavor_ram,
disk => $tempest_flavor_disk, disk => $tempest_flavor_disk,
vcpus => $tempest_flavor_vcpus, vcpus => $tempest_flavor_vcpus,
require => [ Class['::nova::api'], Class['::nova::keystone::auth'] ],
} }
nova_flavor { $tempest_flavor_alt_name : nova_flavor { $tempest_flavor_alt_name :
ensure => present, ensure => present,
@ -75,7 +74,6 @@ class packstack::provision::tempest ()
ram => $tempest_flavor_alt_ram, ram => $tempest_flavor_alt_ram,
disk => $tempest_flavor_alt_disk, disk => $tempest_flavor_alt_disk,
vcpus => $tempest_flavor_alt_vcpus, vcpus => $tempest_flavor_alt_vcpus,
require => [ Class['::nova::api'], Class['::nova::keystone::auth'] ],
} }
# Service availability for testing based on configuration # Service availability for testing based on configuration