[openstack-packstack/f20] use correct syntax to install multiple packages
Pádraig Brady
pbrady at fedoraproject.org
Fri Dec 20 15:35:34 UTC 2013
commit c8e4f0c7f537ab7e2f963c219fde2c1e6a466d25
Author: Pádraig Brady <P at draigBrady.com>
Date: Fri Dec 20 13:23:59 2013 +0000
use correct syntax to install multiple packages
The incorrect syntax is rejected by puppet >= 3.4
Conflicts:
openstack-packstack.spec
neutron-puppet-3.4.patch | 55 ++++++++++++++++++++++++++++++++++++++++++++
openstack-packstack.spec | 9 ++++++-
packstack-puppet-3.4.patch | 49 +++++++++++++++++++++++++++++++++++++++
3 files changed, 112 insertions(+), 1 deletions(-)
---
diff --git a/neutron-puppet-3.4.patch b/neutron-puppet-3.4.patch
new file mode 100644
index 0000000..8094dc6
--- /dev/null
+++ b/neutron-puppet-3.4.patch
@@ -0,0 +1,55 @@
+From fbd1b1cbffbcfb7005f5ffa2de986ba320317cc2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
+Date: Fri, 20 Dec 2013 11:06:22 +0000
+Subject: [PATCH] fix dnsmasq install logic rejected by puppet-3.4
+
+---
+ manifests/agents/dhcp.pp | 8 ++++++--
+ manifests/params.pp | 4 ++--
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/packstack/puppet/modules/neutron/manifests/agents/dhcp.pp b/packstack/puppet/modules/neutron/manifests/agents/dhcp.pp
+index cc90a57..c8dc2a1 100644
+--- a/packstack/puppet/modules/neutron/manifests/agents/dhcp.pp
++++ b/packstack/puppet/modules/neutron/manifests/agents/dhcp.pp
+@@ -58,9 +58,13 @@ class neutron::agents::dhcp (
+ case $dhcp_driver {
+ /\.Dnsmasq/: {
+ Package['dnsmasq'] -> Package<| title == 'neutron-dhcp-agent' |>
+- package { 'dnsmasq':
++ package {
++ 'dnsmasq':
+ ensure => present,
+- name => $::neutron::params::dnsmasq_packages,
++ name => $::neutron::params::dnsmasq_package;
++
++ 'dnsmasq-utils':
++ ensure => present;
+ }
+ }
+ default: {
+diff --git a/packstack/puppet/modules/neutron/manifests/params.pp b/packstack/puppet/modules/neutron/manifests/params.pp
+index 1d5b82c..952dac8 100644
+--- a/packstack/puppet/modules/neutron/manifests/params.pp
++++ b/packstack/puppet/modules/neutron/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']
+
+--
+1.7.7.6
+
diff --git a/openstack-packstack.spec b/openstack-packstack.spec
index 0a84d17..fe0f6f5 100644
--- a/openstack-packstack.spec
+++ b/openstack-packstack.spec
@@ -4,7 +4,7 @@
Name: openstack-packstack
Version: 2013.2.1
#Release: 1%{?dist}
-Release: 0.24.dev%{git_revno}%{?dist}
+Release: 0.25.dev%{git_revno}%{?dist}
Summary: Openstack Install Utility
Group: Applications/System
@@ -13,6 +13,8 @@ URL: https://github.com/stackforge/packstack
# Tarball is created by bin/release.sh
Source0: http://mmagr.fedorapeople.org/downloads/packstack/packstack-%{version}dev%{git_revno}.tar.gz
Patch0: Mariadb-patch.patch
+Patch1: packstack-puppet-3.4.patch
+Patch2: neutron-puppet-3.4.patch
BuildArch: noarch
@@ -46,6 +48,8 @@ Set of Puppet modules used by Packstack to install OpenStack
%setup -n packstack-%{version}dev%{git_revno}
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
# Sanitizing a lot of the files in the puppet modules, they come from seperate upstream projects
find packstack/puppet/modules \( -name .fixtures.yml -o -name .gemfile -o -name ".travis.yml" -o -name .rspec \) -exec rm {} +
@@ -103,6 +107,9 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
%changelog
+* Fri Dec 20 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2.1-0.25.dev936
+- Use correct syntax to install multiple packages (rhbz#1045283)
+
* Fri Dec 20 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2.1-0.24.dev936
- Reinstate the V1 API needed by cinder client (rhbz#1043280)
- Use class for notifier strategy (rhbz#1020002)
diff --git a/packstack-puppet-3.4.patch b/packstack-puppet-3.4.patch
new file mode 100644
index 0000000..5b55b4a
--- /dev/null
+++ b/packstack-puppet-3.4.patch
@@ -0,0 +1,49 @@
+From 58c42fd69eb74a436d837173f3055f31aa56d6e0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
+Date: Fri, 20 Dec 2013 11:51:04 +0000
+Subject: [PATCH] use correct syntax to install multiple packages
+
+The incorrect syntax is rejected by puppet >= 3.4
+---
+ packstack/puppet/templates/horizon.pp | 6 +++---
+ packstack/puppet/templates/openstack_client.pp | 10 ++++------
+ 2 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/packstack/puppet/templates/horizon.pp b/packstack/puppet/templates/horizon.pp
+index f7d5086..925709f 100644
+--- a/packstack/puppet/templates/horizon.pp
++++ b/packstack/puppet/templates/horizon.pp
+@@ -1,7 +1,7 @@
+
+-package {"horizon-packages":
+- name => ["python-memcached", "python-netaddr"],
+- notify => Class["horizon"],
++$horizon_packages = ["python-memcached", "python-netaddr"]
++package {$horizon_packages:
++ notify => Class["horizon"]
+ }
+
+ file {"/etc/httpd/conf.d/rootredirect.conf":
+diff --git a/packstack/puppet/templates/openstack_client.pp b/packstack/puppet/templates/openstack_client.pp
+index cde718c..6a04879 100644
+--- a/packstack/puppet/templates/openstack_client.pp
++++ b/packstack/puppet/templates/openstack_client.pp
+@@ -1,11 +1,9 @@
+
+-package {"clientdeps":
+- name => ["python-iso8601"]
+-}
++$clientdeps = ["python-iso8601"]
++package { $clientdeps: }
+
+-package {"clientlibs":
+- name => ["python-novaclient", "python-keystoneclient", "python-glanceclient", "python-swiftclient", "python-cinderclient"]
+-}
++$clientlibs = ["python-novaclient", "python-keystoneclient", "python-glanceclient", "python-swiftclient", "python-cinderclient"]
++package { $clientlibs: }
+
+ $rcadmin_content = "export OS_USERNAME=admin
+ export OS_TENANT_NAME=admin
+--
+1.7.7.6
+
More information about the scm-commits
mailing list