summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@yahoo.com>2010-09-28 17:24:25 -0700
committerVishvananda Ishaya <vishvananda@yahoo.com>2010-09-28 17:24:25 -0700
commit533f72379931aa7bf67a0e7d1d7664ca151afda0 (patch)
tree0a1c0a600892f038a8ee3eec701cf5f9b4bd1796
parent1e4bca12e7e06698d3a13d6a208be90647f27555 (diff)
downloadnova-533f72379931aa7bf67a0e7d1d7664ca151afda0.tar.gz
nova-533f72379931aa7bf67a0e7d1d7664ca151afda0.tar.xz
nova-533f72379931aa7bf67a0e7d1d7664ca151afda0.zip
fix flag defaults
-rw-r--r--nova/flags.py2
-rw-r--r--nova/network/linux_net.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/flags.py b/nova/flags.py
index 5ed0f92ee..92f6766cf 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -190,7 +190,7 @@ DEFINE_string('rabbit_virtual_host', '/', 'rabbit virtual host')
DEFINE_string('control_exchange', 'nova', 'the main exchange to connect to')
DEFINE_string('cc_host', '127.0.0.1', 'ip of api server')
DEFINE_integer('cc_port', 8773, 'cloud controller port')
-DEFINE_string('ec2_url', 'http://%s:%s/services/Cloud' % (FLAGS.cc_host, FLAGS.cc_port),
+DEFINE_string('ec2_url', 'http://127.0.0.1:8773/services/Cloud'
'Url to ec2 api server')
DEFINE_string('default_image', 'ami-11111',
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
index 6f1d594fa..fa77c5ba8 100644
--- a/nova/network/linux_net.py
+++ b/nova/network/linux_net.py
@@ -39,7 +39,7 @@ flags.DEFINE_string('public_interface', 'vlan1',
'Interface for public IP addresses')
flags.DEFINE_string('bridge_dev', 'eth0',
'network device for bridges')
-flags.DEFINE_string('routing_source_ip', utils.get_my_ip(),
+flags.DEFINE_string('routing_source_ip', '127.0.0.1',
'Public IP of network host')
flags.DEFINE_bool('use_nova_chains', False,
'use the nova_ routing chains instead of default')