|
35 | 35 | Hash[String,Hash] $files = {}, |
36 | 36 | Optional[Boolean] $disable_ipv6 = undef, |
37 | 37 | Optional[Hash[String, Struct[{ |
38 | | - content => Stdlib::Base64, |
39 | | - }]]] $service_oneshot = {}, |
| 38 | + content => Stdlib::Base64, |
| 39 | + }]]] $service_oneshot = undef, |
40 | 40 |
|
41 | 41 | Hash[String, Array[Stdlib::IP::Address::V4]] $locations = {}, |
42 | 42 | Eit_types::Encrypt::Params $encrypt_params = ['ssh_authorized_keys.*.key'], |
|
167 | 167 | $_source = $_file_parameters['source'] |
168 | 168 | # Only allow sources that the Obmondo file resource pattern |
169 | 169 | if $_source and $_source !~ Eit_Files::Source { |
170 | | - fail("Invalid file resource |
| 170 | + fail("Invalid file resource |
171 | 171 | ${_element}") |
172 | 172 | } |
173 | 173 |
|
|
180 | 180 | # Service_Oneshot |
181 | 181 | ################# |
182 | 182 |
|
183 | | - $service_oneshot.each |$name, $value| { |
| 183 | + $service_oneshot.lest || {{} }.each |$name, $value| { |
184 | 184 | profile::system::service_oneshot { $name: |
185 | 185 | content => $value['content'], |
186 | 186 | } |
|
215 | 215 | $_obmondo_system_facts = { |
216 | 216 | 'obmondo_system' => { |
217 | 217 | 'location' => $_location, |
218 | | - 'certname' => $facts['networking']['hostname'] |
219 | | - } |
| 218 | + 'certname' => $facts['networking']['hostname'], |
| 219 | + }, |
220 | 220 | } |
221 | 221 |
|
222 | 222 | file { "${_puppet_dir}/facter/facts.d/obmondo_system.yaml": |
|
234 | 234 |
|
235 | 235 | # NOTE: includes all these system profile, but some are set to enable |
236 | 236 | # and some set to disable, depending on the requirement. |
237 | | - include common::system::authentication |
238 | | - include common::system::dns |
239 | | - include common::system::kernel |
240 | | - include common::system::grub |
241 | | - include common::system::failover |
242 | | - include common::system::hardware |
243 | | - include common::system::limits |
244 | | - include common::system::package_management |
245 | | - include common::system::motd |
246 | | - include common::system::nsswitch |
247 | | - include common::system::sshd |
248 | | - include common::system::time |
249 | | - include common::system::cloud_init |
250 | | - include common::system::selinux |
251 | | - if $::subscription { |
252 | | - include common::system::updates |
| 237 | + lookup('common::system::classes').each | $subclass | { |
| 238 | + include $subclass |
253 | 239 | } |
254 | 240 |
|
255 | 241 | unless lookup('common::system::jumphost::configs', Hash, undef, {}).empty { |
|
0 commit comments