Remove unused instance_name_template flag

Only used in nova/db/sqlalchemy/models

Change-Id: I1029848bb639402cad30c01b51630c0ddd9dd7b8

diff --git a/cinder/db/api.py b/cinder/db/api.py
index 5e49a5eddc4cbfc5c79a715ec59321c4381c7937..fef1287f39a085e126bccd78468ccbb0a67c77bf 100644 (file)
--- a/cinder/db/api.py
+++ b/cinder/db/api.py
@@ -56,9 +56,6 @@ db_opts = [
     cfg.BoolOpt('enable_new_services',
                 default=True,
                 help='Services to be added to the available pool on create'),
-    cfg.StrOpt('instance_name_template',
-               default='instance-%08x',
-               help='Template string to be used to generate instance names'),
     cfg.StrOpt('volume_name_template',
                default='volume-%s',
                help='Template string to be used to generate instance names'),

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index 3dba756d12641ec863a55ce7ae5e7ef893a101a9..b68d3b95a089dd36dff7fada710454e5cb9e4999 100644 (file)
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -261,8 +261,6 @@
 # ec2_listen_port=8773
 ###### (BoolOpt) Services to be added to the available pool on create
 # enable_new_services=true
-###### (StrOpt) Template string to be used to generate instance names
-# instance_name_template="instance-%08x"
 ###### (StrOpt) IP address for metadata api to listen
 # metadata_listen="0.0.0.0"
 ###### (IntOpt) port for metadata api to listen