Fix pep8/flake8 errors, remove unrelated code

This commit is contained in:
Kris Lindgren
2014-06-03 10:59:01 -06:00
parent a03143782a
commit 334c65bc84
2 changed files with 2 additions and 6 deletions

View File

@@ -27,7 +27,7 @@ opts = [
default='http://169.254.169.254/',
help='The base URL where the service looks for metadata'),
cfg.BoolOpt('ec2_add_metadata_private_ip_route', default=True,
help='Add a route for the metadata ip address to the gateway'),
help='Add a route for the metadata ip address to the gateway'),
]
CONF = cfg.CONF
@@ -82,10 +82,6 @@ class EC2Service(base.BaseMetadataService):
def get_instance_id(self):
return self._get_cache_data('%s/meta-data/instance-id' %
self._metadata_version)
def get_availability_zone(self):
return self._get_cache_data('%s/meta-data/placement/availability-zone' %
self._metadata_version)
def get_public_keys(self):
ssh_keys = []

View File

@@ -28,7 +28,7 @@ opts = [
cfg.StrOpt('metadata_base_url', default='http://169.254.169.254/',
help='The base URL where the service looks for metadata'),
cfg.BoolOpt('add_metadata_private_ip_route', default=True,
help='Add a route for the metadata ip address to the gateway'),
help='Add a route for the metadata ip address to the gateway'),
]
CONF = cfg.CONF