diff --git a/ceph-15.2.3-252-gf2237253cd.tar.bz2 b/ceph-15.2.3-252-gf2237253cd.tar.bz2
deleted file mode 100644
index 6b337e4..0000000
--- a/ceph-15.2.3-252-gf2237253cd.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:960dc7edf7f511b9c929c1ab71068835c10d4396ea532ad66d3ba137d5dad4b6
-size 151521918
diff --git a/ceph-15.2.3-455-g04541bbb8e.tar.bz2 b/ceph-15.2.3-455-g04541bbb8e.tar.bz2
new file mode 100644
index 0000000..042efbc
--- /dev/null
+++ b/ceph-15.2.3-455-g04541bbb8e.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:38be2d8095a1c83cbe1241d50222f6f5f9da6ba61560335bbf0a83aa531f961e
+size 151410361
diff --git a/ceph-test.changes b/ceph-test.changes
index fb7bef6..5561884 100644
--- a/ceph-test.changes
+++ b/ceph-test.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jun 16 13:33:00 UTC 2020 - Nathan Cutler <ncutler@suse.com>
+
+- Update to 15.2.3-455-g04541bbb8e:
+  + rebase on tip of upstream "octopus" branch, SHA1 ec315386e94adb4f844f6f3b7ce519e8f7789213
+    * python-common: only validate host_pattern if present
+
 -------------------------------------------------------------------
 Mon Jun  8 14:18:25 UTC 2020 - Nathan Cutler <ncutler@suse.com>
 
diff --git a/ceph-test.spec b/ceph-test.spec
index 0ab17f8..8fd31f6 100644
--- a/ceph-test.spec
+++ b/ceph-test.spec
@@ -99,7 +99,7 @@
 # main package definition
 #################################################################################
 Name: ceph-test
-Version: 15.2.3.252+gf2237253cd
+Version: 15.2.3.455+g04541bbb8e
 Release: 0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch: 2
@@ -115,7 +115,7 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
 Group: System/Filesystems
 %endif
 URL: http://ceph.com/
-Source0: %{?_remote_tarball_prefix}ceph-15.2.3-252-gf2237253cd.tar.bz2
+Source0: %{?_remote_tarball_prefix}ceph-15.2.3-455-g04541bbb8e.tar.bz2
 %if 0%{?suse_version}
 Source96: checkin.sh
 Source97: README-checkin.txt
@@ -544,7 +544,7 @@ This package contains Ceph benchmarks and test tools.
 %if 0%{?suse_version}
 %endif
 %prep
-%autosetup -p1 -n ceph-15.2.3-252-gf2237253cd
+%autosetup -p1 -n ceph-15.2.3-455-g04541bbb8e
 
 %build
 # LTO can be enabled as soon as the following GCC bug is fixed:
diff --git a/ceph.changes b/ceph.changes
index fb7bef6..5561884 100644
--- a/ceph.changes
+++ b/ceph.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jun 16 13:33:00 UTC 2020 - Nathan Cutler <ncutler@suse.com>
+
+- Update to 15.2.3-455-g04541bbb8e:
+  + rebase on tip of upstream "octopus" branch, SHA1 ec315386e94adb4f844f6f3b7ce519e8f7789213
+    * python-common: only validate host_pattern if present
+
 -------------------------------------------------------------------
 Mon Jun  8 14:18:25 UTC 2020 - Nathan Cutler <ncutler@suse.com>
 
diff --git a/ceph.spec b/ceph.spec
index d78ff9f..fdf3a2e 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -99,7 +99,7 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	15.2.3.252+gf2237253cd
+Version:	15.2.3.455+g04541bbb8e
 Release:	0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
@@ -115,7 +115,7 @@ License:	LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
 Group:		System/Filesystems
 %endif
 URL:		http://ceph.com/
-Source0:	%{?_remote_tarball_prefix}ceph-15.2.3-252-gf2237253cd.tar.bz2
+Source0:	%{?_remote_tarball_prefix}ceph-15.2.3-455-g04541bbb8e.tar.bz2
 %if 0%{?suse_version}
 # _insert_obs_source_lines_here
 ExclusiveArch:  x86_64 aarch64 ppc64le s390x
@@ -649,9 +649,11 @@ Requires:       python%{python3_pkgversion}-remoto
 Requires:       cephadm = %{_epoch_prefix}%{version}-%{release}
 %if 0%{?suse_version}
 Requires:       openssh
+Requires:       python%{python3_pkgversion}-Jinja2
 %endif
 %if 0%{?rhel} || 0%{?fedora}
 Requires:       openssh-clients
+Requires:       python%{python3_pkgversion}-jinja2
 %endif
 %description mgr-cephadm
 ceph-mgr-cephadm is a ceph-mgr module for orchestration functions using
@@ -1121,7 +1123,7 @@ This package provides Ceph’s default alerts for Prometheus.
 # common
 #################################################################################
 %prep
-%autosetup -p1 -n ceph-15.2.3-252-gf2237253cd
+%autosetup -p1 -n ceph-15.2.3-455-g04541bbb8e
 
 %build
 # LTO can be enabled as soon as the following GCC bug is fixed: