Attachment 839521 Details for Bug 1045283 – fix neutron dnsmasq install code

[patch] fix neutron dnsmasq install code

neutron-puppet-3.4.patch (text/plain), 1.30 KB, created by Pádraig Brady on 2013-12-20 10:59:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pádraig Brady

Created: 2013-12-20 10:59:00 UTC

Size: 1.30 KB

patch

obsolete

>diff --git a/manifests/agents/dhcp.pp b/manifests/agents/dhcp.pp
>index cc90a57..e283db4 100644
>--- a/manifests/agents/dhcp.pp
>+++ b/manifests/agents/dhcp.pp
>@@ -60,8 +60,9 @@ class neutron::agents::dhcp (
>       Package['dnsmasq'] -> Package<| title == 'neutron-dhcp-agent' |>
>       package { 'dnsmasq':
>         ensure => present,
>-        name   => $::neutron::params::dnsmasq_packages,
>+        name   => $::neutron::params::dnsmasq_package,
>       }
>+      package { 'dnsmasq-utils': ensure => present }
>     }
>     default: {
>       fail("Unsupported dhcp_driver ${dhcp_driver}")
>diff --git a/manifests/params.pp b/manifests/params.pp
>index 1d5b82c..952dac8 100644
>--- a/manifests/params.pp
>+++ b/manifests/params.pp
>@@ -23,7 +23,7 @@ class neutron::params {
>     $dhcp_agent_package = false
>     $dhcp_agent_service = 'neutron-dhcp-agent'
> 
>-    $dnsmasq_packages   = ['dnsmasq', 'dnsmasq-utils']
>+    $dnsmasq_package   = 'dnsmasq'
> 
>     $lbaas_agent_package = false
>     $lbaas_agent_service = 'neutron-lbaas-agent'
>@@ -78,7 +78,7 @@ class neutron::params {
>     $metadata_agent_package = 'neutron-metadata-agent'
>     $metadata_agent_service = 'neutron-metadata-agent'
> 
>-    $dnsmasq_packages   = ['dnsmasq-base', 'dnsmasq-utils']
>+    $dnsmasq_package   = 'dnsmasq-base'
> 
>     $isc_dhcp_packages  = ['isc-dhcp-server']
>

Actions: View | Diff

Attachments on bug 1045283: 839521 | 839533