summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-08 05:32:13 +0000
committerGerrit Code Review <review@openstack.org>2013-01-08 05:32:13 +0000
commit9d37f75d923fac77e5234a3fe382ccf6e400c3cb (patch)
tree45bf1acda20eaab9ca32b4f4d0237963dd461b0a
parent3e2a1e2c74d85c6faf9e9531f2a4b19fb4c61a63 (diff)
parent904814e51f4f24a704d98c3d13a8cce2a5bddc7e (diff)
downloadnova-9d37f75d923fac77e5234a3fe382ccf6e400c3cb.tar.gz
nova-9d37f75d923fac77e5234a3fe382ccf6e400c3cb.tar.xz
nova-9d37f75d923fac77e5234a3fe382ccf6e400c3cb.zip
Merge "Remove unused aws access key opts"
-rw-r--r--nova/config.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/nova/config.py b/nova/config.py
index 2cc153203..d32f9549f 100644
--- a/nova/config.py
+++ b/nova/config.py
@@ -62,12 +62,6 @@ global_opts = [
cfg.StrOpt('my_ip',
default=_get_my_ip(),
help='ip address of this host'),
- cfg.StrOpt('aws_access_key_id',
- default='admin',
- help='AWS Access ID'),
- cfg.StrOpt('aws_secret_access_key',
- default='admin',
- help='AWS Access Key'),
cfg.StrOpt('glance_host',
default='$my_ip',
help='default glance hostname or ip'),