diff --git a/ceilometer/pipeline.py b/ceilometer/pipeline.py
index a6b3a4d1ca..b9f98ae4f6 100644
--- a/ceilometer/pipeline.py
+++ b/ceilometer/pipeline.py
@@ -872,8 +872,9 @@ class PollingManager(ConfigManagerBase):
         try:
             cfg = self.load_config(cfg_file)
         except (TypeError, IOError):
-            LOG.warning(_LW('Unable to locate polling configuration, falling '
-                            'back to pipeline configuration.'))
+            LOG.warning(_LW('Using the pipeline configuration for polling '
+                            'is deprecated. %s should '
+                            'be used instead.'), cfg_file)
             cfg = self.load_config(conf.pipeline_cfg_file)
         self.sources = []
         if 'sources' not in cfg:
diff --git a/releasenotes/notes/polling-deprecation-4d5b83180893c053.yaml b/releasenotes/notes/polling-deprecation-4d5b83180893c053.yaml
new file mode 100644
index 0000000000..ad605f803b
--- /dev/null
+++ b/releasenotes/notes/polling-deprecation-4d5b83180893c053.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Usage of pipeline.yaml for polling configuration is now deprecated. The
+    dedicated polling.yaml should be used instead.