[Ovirt-devel] Re: [PATCH server] dnsmasq cleanup to clear false installation errors, also pull in livecd-tools for cobbler-import command

[Joey Boggs]

Joey Boggs wrote:
> This will fix the dnsmasq restart error when the installer runs, there's not really a problem but due to it logging an error needs to be fixed.
>
> ---
>  installer/bin/ovirt-installer                |    2 +-
>  installer/modules/ovirt/manifests/cobbler.pp |    2 +-
>  installer/modules/ovirt/manifests/freeipa.pp |    4 ++--
>  installer/modules/ovirt/manifests/ovirt.pp   |    3 +++
>  4 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/installer/bin/ovirt-installer b/installer/bin/ovirt-installer
> index f1e2b21..3ba9813 100755
> --- a/installer/bin/ovirt-installer
> +++ b/installer/bin/ovirt-installer
> @@ -180,7 +180,7 @@ if dhcp_setup == "n"
>  end
>  
>  # Cobbler Configuration
> -cobbler_setup = prompt_yes_no("Do you have a cobbler already that you wish to use?")
> +cobbler_setup = prompt_yes_no("Do you have a cobbler server already that you wish to use?")
>  
>  if cobbler_setup == "y"
>      cobbler_hostname = prompt_for_answer("Enter the hostname of your cobbler server:", :regex => IP_OR_FQDN)
> diff --git a/installer/modules/ovirt/manifests/cobbler.pp b/installer/modules/ovirt/manifests/cobbler.pp
> index 3ffe205..ed9f3c9 100644
> --- a/installer/modules/ovirt/manifests/cobbler.pp
> +++ b/installer/modules/ovirt/manifests/cobbler.pp
> @@ -119,7 +119,7 @@ class cobbler::bundled {
>      single_exec {"cobbler-import":
>          command => "/usr/sbin/cobbler-import >> /var/log/cobbler-import.log 2>&1",
>          require => [File["/usr/sbin/cobbler-import"],
> -                   Service["cobblerd"],Package[ovirt-node-image]]
> +                   Service["cobblerd"],Package[ovirt-node-image],Package[livecd-tools]]
>      }
>  
>  
> diff --git a/installer/modules/ovirt/manifests/freeipa.pp b/installer/modules/ovirt/manifests/freeipa.pp
> index 2240bcc..484812e 100644
> --- a/installer/modules/ovirt/manifests/freeipa.pp
> +++ b/installer/modules/ovirt/manifests/freeipa.pp
> @@ -55,8 +55,8 @@ class freeipa::bundled{
>          }
>  
>  	single_exec {"dnsmasq_restart":
> -		command => "/etc/init.d/dnsmasq restart",
> -        require => Service["dnsmasq"]
> +                command => "/usr/bin/pkill dnsmasq;/etc/init.d/dnsmasq start",
> +                require => Single_exec[add_mgmt_server_to_etc_hosts]
>  	}
>  
>          single_exec {"ipa_server_install":
> diff --git a/installer/modules/ovirt/manifests/ovirt.pp b/installer/modules/ovirt/manifests/ovirt.pp
> index 5c0ab1d..eccb4b2 100644
> --- a/installer/modules/ovirt/manifests/ovirt.pp
> +++ b/installer/modules/ovirt/manifests/ovirt.pp
> @@ -64,6 +64,9 @@ class ovirt::setup {
>  	        ensure => installed;
>  	}
>  
> +        package {"livecd-tools":
> +                ensure => installed;
> +        }
>  	file {"/etc/collectd.conf":
>  		source => "puppet:///ovirt/collectd.conf",
>  		notify => Service[collectd],
>   
went ahead and pushed this