diff --git a/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0002-Newton-rebase-fixes.patch b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0002-Newton-rebase-fixes.patch index 62caeeff9..bf626ea5b 100644 --- a/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0002-Newton-rebase-fixes.patch +++ b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0002-Newton-rebase-fixes.patch @@ -1,4 +1,4 @@ -From 89e1781309a8415d65c50c13c18742a92c970362 Mon Sep 17 00:00:00 2001 +From 570520c5197dd36c3e4a7956d5916426fb75856a Mon Sep 17 00:00:00 2001 From: Don Penney Date: Tue, 7 Feb 2017 15:49:02 -0500 Subject: [PATCH] Newton rebase fixes @@ -9,10 +9,10 @@ Subject: [PATCH] Newton rebase fixes 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/manifests/mon.pp b/manifests/mon.pp -index 5f7138f..543d044 100644 +index fa99df5..b3458d6 100644 --- a/manifests/mon.pp +++ b/manifests/mon.pp -@@ -100,10 +100,13 @@ define ceph::mon ( +@@ -99,10 +99,13 @@ define ceph::mon ( } # Everything else that is supported by puppet-ceph should run systemd. } else { diff --git a/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0003-Ceph-Jewel-rebase.patch b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0003-Ceph-Jewel-rebase.patch index 62fe5dc00..d1385ae7a 100644 --- a/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0003-Ceph-Jewel-rebase.patch +++ b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0003-Ceph-Jewel-rebase.patch @@ -1,4 +1,4 @@ -From b245ba801e8dccffe6df30b448d307b9c332a8bf Mon Sep 17 00:00:00 2001 +From c9a5520620d313c08e7f751f3469ec5f4c220486 Mon Sep 17 00:00:00 2001 From: Daniel Badea Date: Thu, 23 Mar 2017 08:04:31 +0000 Subject: [PATCH] ceph jewel rebase @@ -10,10 +10,10 @@ Subject: [PATCH] ceph jewel rebase 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/manifests/mon.pp b/manifests/mon.pp -index 543d044..ad92061 100644 +index b3458d6..17cb925 100644 --- a/manifests/mon.pp +++ b/manifests/mon.pp -@@ -107,6 +107,7 @@ define ceph::mon ( +@@ -106,6 +106,7 @@ define ceph::mon ( start => "service ceph start mon.${id}", stop => "service ceph stop mon.${id}", status => "service ceph status mon.${id}",