File tree Expand file tree Collapse file tree 3 files changed +24
-5
lines changed Expand file tree Collapse file tree 3 files changed +24
-5
lines changed Original file line number Diff line number Diff line change 150
150
$compute_manager = ' nova.compute.manager.ComputeManager' ,
151
151
$heal_instance_info_cache_interval = ' 60' ,
152
152
$pci_passthrough = undef ,
153
- $config_drive_format = undef ,
153
+ $config_drive_format = $::os_service_default ,
154
154
$allow_resize_to_same_host = false ,
155
155
$vcpu_pin_set = $::os_service_default,
156
156
# DEPRECATED PARAMETERS
262
262
}
263
263
}
264
264
265
- if ($config_drive_format ) {
266
- nova_config {
267
- ' DEFAULT/config_drive_format' : value => $config_drive_format ;
268
- }
265
+ if is_service_default($config_drive_format ) or $config_drive_format == ' iso9660' {
266
+ ensure_packages($::nova::params::genisoimage_package_name , {
267
+ tag => [' openstack' , ' nova-support-package' ],
268
+ })
269
+ }
270
+
271
+ nova_config {
272
+ ' DEFAULT/config_drive_format' : value => $config_drive_format ;
269
273
}
274
+
270
275
}
Original file line number Diff line number Diff line change 29
29
$sqlite_package_name = undef
30
30
$pymysql_package_name = undef
31
31
$ceph_client_package_name = ' ceph-common'
32
+ $genisoimage_package_name = ' genisoimage'
32
33
# service names
33
34
$api_service_name = ' openstack-nova-api'
34
35
$cells_service_name = ' openstack-nova-cells'
88
89
$sqlite_package_name = ' python-pysqlite2'
89
90
$pymysql_package_name = ' python-pymysql'
90
91
$ceph_client_package_name = ' ceph'
92
+ $genisoimage_package_name = ' genisoimage'
91
93
# service names
92
94
$api_service_name = ' nova-api'
93
95
$cells_service_name = ' nova-cells'
Original file line number Diff line number Diff line change 43
43
end
44
44
45
45
it { is_expected . to contain_nova_config ( 'DEFAULT/heal_instance_info_cache_interval' ) . with_value ( '60' ) }
46
+
47
+ it 'installs genisoimage package and sets config_drive_format' do
48
+ is_expected . to contain_nova_config ( 'DEFAULT/config_drive_format' ) . with ( :value => '<SERVICE DEFAULT>' )
49
+ is_expected . to contain_package ( 'genisoimage' ) . with (
50
+ :ensure => 'present' ,
51
+ )
52
+ is_expected . to contain_package ( 'genisoimage' ) . that_requires ( 'Anchor[nova::install::begin]' )
53
+ is_expected . to contain_package ( 'genisoimage' ) . that_comes_before ( 'Anchor[nova::install::end]' )
54
+ end
46
55
end
47
56
48
57
context 'with overridden parameters' do
116
125
end
117
126
it 'configures nova config_drive_format to vfat' do
118
127
is_expected . to contain_nova_config ( 'DEFAULT/config_drive_format' ) . with_value ( 'vfat' )
128
+ is_expected . to_not contain_package ( 'genisoimage' ) . with (
129
+ :ensure => 'present' ,
130
+ )
119
131
end
120
132
end
121
133
You can’t perform that action at this time.
0 commit comments