diff --git a/hooks/nova-compute-common b/hooks/nova-compute-common index 2ce0454..0126bd2 100755 --- a/hooks/nova-compute-common +++ b/hooks/nova-compute-common @@ -182,30 +182,3 @@ cgroup_device_acl = [ EOF service libvirt-bin reload } - -function give_me_numbers { - local name="$1" - local address= - - case "$name" in - [A-Za-z]*) - address=$(getent hosts "$name" | awk '{print $1}') - case "$address" in - 127.*) - address=$(dig +short "$name") - if [ -z "$address" ]; then - echo "$name" - fi - echo "$address" - ;; - *) - echo "$address" - ;; - esac - ;; - *) - # not a name, maybe it's an address? - echo "$name" - ;; - esac -} diff --git a/hooks/nova-compute-relations b/hooks/nova-compute-relations index a1c449c..e0a0fef 100755 --- a/hooks/nova-compute-relations +++ b/hooks/nova-compute-relations @@ -208,7 +208,7 @@ function ceph_changed { MONS=`relation-list` mon_hosts="" for mon in $MONS; do - mon_hosts="$mon_hosts $(give_me_numbers $(relation-get private-address $mon)):6789" + mon_hosts="$mon_hosts $(get_ip $(relation-get private-address $mon)):6789" done cat > /etc/ceph/ceph.conf << EOF [global]