diff --git a/manifests/storage/all.pp b/manifests/storage/all.pp
index 1b081367..e723e96c 100644
--- a/manifests/storage/all.pp
+++ b/manifests/storage/all.pp
@@ -125,6 +125,18 @@ class swift::storage::all(
 
   include ::swift::deps
 
+  if ($object_port == '6000') {
+    warning('The default port for the object storage server has changed from 6000 to 6200 and will be changed in a later release')
+  }
+
+  if ($container_port == '6001') {
+    warning('The default port for the container storage server has changed from 6001 to 6201 and will be changed in a later release')
+  }
+
+  if ($account_port == '6002') {
+    warning('The default port for the account storage server has changed from 6002 to 6202 and will be changed in a later release')
+  }
+
   class { '::swift::storage':
     storage_local_net_ip => $storage_local_net_ip,
   }
diff --git a/releasenotes/notes/swift-port-warning-0ac39e6905f977b5.yaml b/releasenotes/notes/swift-port-warning-0ac39e6905f977b5.yaml
new file mode 100644
index 00000000..9af4e9d7
--- /dev/null
+++ b/releasenotes/notes/swift-port-warning-0ac39e6905f977b5.yaml
@@ -0,0 +1,8 @@
+---
+features:
+  - Adds a warning when ports 6000-6002 are used for object, container,
+    and/or account storage servers. LP#1521339
+upgrade:
+  - Operators shoud prepare for the port change by specifying ports for the
+    object storage server, container storage server, and account storage
+    server.