diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-08-06 14:10:15 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-08-06 14:10:15 +0000 |
commit | d57732285842112d18e4671b43b3ed44302c50ce (patch) | |
tree | 1c45a5b1393513ed83dbf9077d0d1540c3145dee | |
parent | fb0aaca6e6d26c36825238fdca09b3e38001b48c (diff) | |
parent | aa79b15267454dfd3226aa7dda238d9b93631cbe (diff) | |
download | ironic-d57732285842112d18e4671b43b3ed44302c50ce.tar.gz |
Merge "Use my_ip for neutron URL"
-rw-r--r-- | etc/ironic/ironic.conf.sample | 2 | ||||
-rw-r--r-- | ironic/common/neutron.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index 77e28d541..85dcf752c 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -1031,7 +1031,7 @@ # # URL for connecting to neutron. (string value) -#url=http://127.0.0.1:9696 +#url=http://$my_ip:9696 # Timeout value for connecting to neutron in seconds. (integer # value) diff --git a/ironic/common/neutron.py b/ironic/common/neutron.py index 034a177bd..22360b13e 100644 --- a/ironic/common/neutron.py +++ b/ironic/common/neutron.py @@ -29,7 +29,7 @@ from ironic.openstack.common import log as logging neutron_opts = [ cfg.StrOpt('url', - default='http://127.0.0.1:9696', + default='http://$my_ip:9696', help='URL for connecting to neutron.'), cfg.IntOpt('url_timeout', default=30, |