From 097acddf82b937a042c2591da02da3b2092a1519 Mon Sep 17 00:00:00 2001 From: ZhuRongze Date: Sat, 28 Jul 2012 07:28:50 +0000 Subject: [PATCH] Remove unused instance_name_template flag Only used in nova/db/sqlalchemy/models Change-Id: I1029848bb639402cad30c01b51630c0ddd9dd7b8 --- cinder/db/api.py | 3 --- etc/cinder/cinder.conf.sample | 2 -- 2 files changed, 5 deletions(-) diff --git a/cinder/db/api.py b/cinder/db/api.py index 5e49a5edd..fef1287f3 100644 --- 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 3dba756d1..b68d3b95a 100644 --- 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 -- 2.45.2