Skip to content
Snippets Groups Projects
Commit f070d299 authored by Thomas Bellman's avatar Thomas Bellman
Browse files

Make helper class names compatible with modern Puppet.

The OS-specific helper classes for the xen::dom0 class were named
xen::dom0__::<OS>, while still living in the dom0.pp manifest file.
This is not compatible with newer versions of Puppet, as they will
complain when finding classes whose names does not match the file
they are in.  Rename them to xen::dom0::<OS>, without the trailing
double underscores in the "dom0" name component.
parent 69e14e38
No related branches found
No related tags found
No related merge requests found
......@@ -31,12 +31,12 @@ class xen::dom0($version='default')
case $osdist
{
/^(CentOS)-6(\.|$)/: {
class { 'xen::dom0__::centos_6': version => $version; }
$mgmt_cmd = $xen::dom0__::centos_6::mgmt_cmd
class { 'xen::dom0::centos_6': version => $version; }
$mgmt_cmd = $xen::dom0::centos_6::mgmt_cmd
}
/^(CentOS)-7(\.|$)/: {
class { 'xen::dom0__::centos_7': version => $version; }
$mgmt_cmd = $xen::dom0__::centos_7::mgmt_cmd
class { 'xen::dom0::centos_7': version => $version; }
$mgmt_cmd = $xen::dom0::centos_7::mgmt_cmd
}
default: {
fail("Xen::Dom0: Unsupported operating system, ${osdist}")
......@@ -50,7 +50,7 @@ class xen::dom0($version='default')
# Internal helper definitions and classes below. Not for general use.
class xen::dom0__::centos_6($version)
class xen::dom0::centos_6($version)
{
$mgmt_cmd = '/usr/sbin/xl'
......@@ -60,12 +60,12 @@ class xen::dom0__::centos_6($version)
'xen':
ensure => installed,
require => Xen::Xen4centos::Yumrepo::Install['xen4centos'],
notify => Exec['xen::dom0__::grub-bootxen'];
notify => Exec['xen::dom0::grub-bootxen'];
}
exec {
# FIXME: This needs to be done after the installation
# of the Xen enabled kernel...
'xen::dom0__::grub-bootxen':
'xen::dom0::grub-bootxen':
command => 'grub-bootxen.sh',
path => [ '/sbin', '/usr/sbin', '/bin', '/usr/bin', ],
refreshonly => true;
......@@ -78,7 +78,7 @@ class xen::dom0__::centos_6($version)
enable => true;
}
cfgfile::redhat::sysconfig {
'xen::dom0__::xenconsole_log':
'xen::dom0::xenconsole_log':
subsystem => 'xencommons',
setting => 'XENCONSOLED_TRACE', value => 'all',
require => Package['xen'];
......@@ -86,7 +86,7 @@ class xen::dom0__::centos_6($version)
}
class xen::dom0__::centos_7($version)
class xen::dom0::centos_7($version)
{
$mgmt_cmd = '/usr/sbin/xl'
......@@ -96,12 +96,12 @@ class xen::dom0__::centos_7($version)
'xen':
ensure => installed,
require => Xen::Xen4centos::Yumrepo::Install['xen4centos'],
notify => Exec['xen::dom0__::grub-bootxen'];
notify => Exec['xen::dom0::grub-bootxen'];
}
exec {
# FIXME: This needs to be done after the installation
# of the Xen enabled kernel...
'xen::dom0__::grub-bootxen':
'xen::dom0::grub-bootxen':
command => 'grub-bootxen.sh',
path => [ '/sbin', '/usr/sbin', '/bin', '/usr/bin', ],
refreshonly => true;
......@@ -114,7 +114,7 @@ class xen::dom0__::centos_7($version)
enable => true;
}
cfgfile::redhat::sysconfig {
'xen::dom0__::xenconsole_log':
'xen::dom0::xenconsole_log':
subsystem => 'xencommons',
setting => 'XENCONSOLED_TRACE', value => 'all',
require => Package['xen'];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment