openstack/charm-keystone
Code Issues Proposed changes

Get rid of dig usage

Browse Source
This commit is contained in:
Adam Gandelman 2012-01-12 08:45:13 -08:00
parent b3eb707e52
commit 2da9bb4efd
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hooks/utils.py
View File

@ -91,9 +91,7 @@ def config_get():
error_out("ERROR: Config option has no paramter: %s" % c) error_out("ERROR: Config option has no paramter: %s" % c)
# tack on our private address and ip # tack on our private address and ip
hostname = execute("unit-get private-address")[0].strip() hostname = execute("unit-get private-address")[0].strip()
ip = execute("dig +short %s" % hostname, die=True)[0].strip() config["hostname"] = execute("unit-get private-address")[0].strip()
config["hostname"] = hostname
config["ip"] = ip
return config return config
def relation_set(relation_data): def relation_set(relation_data):
@ -258,8 +256,8 @@ def ensure_initial_admin(config):
# following documentation here, perhaps we should be using juju # following documentation here, perhaps we should be using juju
# public/private addresses for public/internal urls. # public/private addresses for public/internal urls.
public_url = "http://%s:%s/v2.0" % (config["ip"], config["service-port"]) public_url = "http://%s:%s/v2.0" % (config["hostname"], config["service-port"])
admin_url = "http://%s:%s/v2.0" % (config["ip"], config["admin-port"]) admin_url = "http://%s:%s/v2.0" % (config["hostname"], config["admin-port"])
internal_url = "http://%s:%s/v2.0" % (config["ip"], config["service-port"]) internal_url = "http://%s:%s/v2.0" % (config["hostname"], config["service-port"])
create_endpoint_template(manager, "RegionOne", "keystone", public_url, create_endpoint_template(manager, "RegionOne", "keystone", public_url,
admin_url, internal_url) admin_url, internal_url)