From a05c4a924048510ff378acd8091a1145c85b884c Mon Sep 17 00:00:00 2001
From: Anusha Unnam <anusha.unnam@intel.com>
Date: Thu, 15 Sep 2016 22:44:54 +0000
Subject: [PATCH] Remove config option snapshot_name_template

Blueprint centralize-config-options-ocata

Change-Id: I2788e31122e66b955bb62489d0842f071452b9d1
---
 nova/conf/compute.py                                 | 12 ------------
 nova/db/sqlalchemy/models.py                         |  4 ----
 ...tion-snapshot_name_template-1d8b1ee431d30e4d.yaml |  6 ++++++
 3 files changed, 6 insertions(+), 16 deletions(-)
 create mode 100644 releasenotes/notes/rm-config-option-snapshot_name_template-1d8b1ee431d30e4d.yaml

diff --git a/nova/conf/compute.py b/nova/conf/compute.py
index 18931e6fff..7717aee969 100644
--- a/nova/conf/compute.py
+++ b/nova/conf/compute.py
@@ -848,18 +848,6 @@ Related options:
 
 * not to be confused with: ``multi_instance_display_name_template``
 """),
-    # TODO(markus_z): 2016-04-04: This is not used anymore. The class
-    # "models.Snapshot" uses it but this class is not used anymore.
-    # This class got introduced with commit 0ba0859 but all calls
-    # to it got removed with commit 5d197cb. This cleanup must
-    # have missed the class "models.Snapshot" and a new change
-    # should remove it completely.
-    cfg.StrOpt('snapshot_name_template',
-         default='snapshot-%s',
-         deprecated_for_removal=True,
-         deprecated_since='14.0.0',
-         deprecated_reason='This is not used anymore.',
-         help='Template string to be used to generate snapshot names')
 ]
 
 
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 428e68550b..2a395d2404 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -546,10 +546,6 @@ class Snapshot(BASE, NovaBase, models.SoftDeleteMixin):
     id = Column(String(36), primary_key=True, nullable=False)
     deleted = Column(String(36), default="")
 
-    @property
-    def name(self):
-        return CONF.snapshot_name_template % self.id
-
     @property
     def volume_name(self):
         return CONF.volume_name_template % self.volume_id
diff --git a/releasenotes/notes/rm-config-option-snapshot_name_template-1d8b1ee431d30e4d.yaml b/releasenotes/notes/rm-config-option-snapshot_name_template-1d8b1ee431d30e4d.yaml
new file mode 100644
index 0000000000..f0efb4d9d3
--- /dev/null
+++ b/releasenotes/notes/rm-config-option-snapshot_name_template-1d8b1ee431d30e4d.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    The deprecated compute config option ``snapshot_name_template``
+    has been removed. It is not used anywhere and has no effect
+    on any code, so there is no impact.