Merge branch 'develop' into neoloc/resolvconf
This commit is contained in:
@@ -30,6 +30,7 @@ class profiles::base (
|
||||
include profiles::accounts::sysadmin
|
||||
include profiles::ntp::client
|
||||
include profiles::dns::base
|
||||
include profiles::cloudinit::init
|
||||
|
||||
# include the python class
|
||||
class { 'python':
|
||||
@@ -44,4 +45,8 @@ class profiles::base (
|
||||
secure_path => '/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/puppetlabs/bin'
|
||||
}
|
||||
|
||||
# manage virtualised guest agents
|
||||
if $::facts['is_virtual'] and $::facts['dmi']['manufacturer'] == 'QEMU' {
|
||||
include profiles::qemu::agent
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user