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

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

@ -16,12 +16,11 @@ class packstack::manila::backend::generic ()
$keystone_url = lookup('CONFIG_KEYSTONE_PUBLIC_URL')
nova_flavor { 'm1.manila':
ensure => present,
id => '66',
ram => '512',
disk => '1',
vcpus => '1',
require => [ Class['::nova::api'], Class['::nova::keystone::auth'] ],
ensure => present,
id => '66',
ram => '512',
disk => '1',
vcpus => '1',
}
-> manila::backend::service_instance{ 'generic':
service_image_location => lookup('CONFIG_MANILA_SERVICE_IMAGE_LOCATION'),

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

@ -78,52 +78,44 @@ class packstack::nova::api ()
$manage_flavors = str2bool(lookup('CONFIG_NOVA_MANAGE_FLAVORS'))
if $manage_flavors {
Class['::nova::api'] -> Nova_flavor<||>
Class['::keystone'] -> Nova_flavor<||>
nova_flavor { 'm1.tiny':
ensure => present,
id => '1',
ram => '512',
disk => '1',
vcpus => '1',
require => [ Class['::nova::api'], Class['::nova::keystone::auth'] ],
ensure => present,
id => '1',
ram => '512',
disk => '1',
vcpus => '1',
}
nova_flavor { 'm1.small':
ensure => present,
id => '2',
ram => '2048',
disk => '20',
vcpus => '1',
require => [ Class['::nova::api'], Class['::nova::keystone::auth'] ],
ensure => present,
id => '2',
ram => '2048',
disk => '20',
vcpus => '1',
}
nova_flavor { 'm1.medium':
ensure => present,
id => '3',
ram => '4096',
disk => '40',
vcpus => '2',
require => [ Class['::nova::api'], Class['::nova::keystone::auth'] ],
ensure => present,
id => '3',
ram => '4096',
disk => '40',
vcpus => '2',
}
nova_flavor { 'm1.large':
ensure => present,
id => '4',
ram => '8192',
disk => '80',
vcpus => '4',
require => [ Class['::nova::api'], Class['::nova::keystone::auth'] ],
ensure => present,
id => '4',
ram => '8192',
disk => '80',
vcpus => '4',
}
nova_flavor { 'm1.xlarge':
ensure => present,
id => '5',
ram => '16384',
disk => '160',
vcpus => '8',
require => [ Class['::nova::api'], Class['::nova::keystone::auth'] ],
ensure => present,
id => '5',
ram => '16384',
disk => '160',
vcpus => '8',
}
}
}

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

@ -62,20 +62,18 @@ class packstack::provision::tempest ()
$tempest_flavor_alt_vcpus= lookup('CONFIG_PROVISION_TEMPEST_FLAVOR_ALT_VCPUS')
nova_flavor { $tempest_flavor_name :
ensure => present,
id => $tempest_flavor_ref,
ram => $tempest_flavor_ram,
disk => $tempest_flavor_disk,
vcpus => $tempest_flavor_vcpus,
require => [ Class['::nova::api'], Class['::nova::keystone::auth'] ],
ensure => present,
id => $tempest_flavor_ref,
ram => $tempest_flavor_ram,
disk => $tempest_flavor_disk,
vcpus => $tempest_flavor_vcpus,
}
nova_flavor { $tempest_flavor_alt_name :
ensure => present,
id => $tempest_flavor_alt_ref,
ram => $tempest_flavor_alt_ram,
disk => $tempest_flavor_alt_disk,
vcpus => $tempest_flavor_alt_vcpus,
require => [ Class['::nova::api'], Class['::nova::keystone::auth'] ],
ensure => present,
id => $tempest_flavor_alt_ref,
ram => $tempest_flavor_alt_ram,
disk => $tempest_flavor_alt_disk,
vcpus => $tempest_flavor_alt_vcpus,
}
# Service availability for testing based on configuration