Merge lp:~cbjchen/charms/trusty/nova-cloud-controller/my_ip_setting into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Liang Chen]

my_ip may be used by other hosts like a callback. It needs to be set to a ip address that can reach
to the nova-cc node from other hosts. This patch will try to use the internal-network address if
applicable, or otherwise the private-address. vip is also considered.

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_lint_check #1307 nova-cloud-controller-next for cbjchen mp243440
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-admin-network has no default value
  I: config.yaml: option haproxy-client-timeout has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option nvp-l3-uuid has no default value
  I: config.yaml: option os-internal-network has no default value

Full lint test output: http://paste.ubuntu.com/9351208/
Build: http://10.98.191.181:8080/job/charm_lint_check/1307/

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_unit_test #1141 nova-cloud-controller-next for cbjchen mp243440
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/nova_cc_hooks 442 145 67% 132-135, 148-149, 173, 184-185, 189, 221, 226-231, 242, 322-325, 333-336, 342-345, 355-371, 380-382, 392-406, 410-419, 505, 515, 519-520, 573, 579-589, 594-605, 615-625, 630-669, 679-694, 702-706, 731-740, 764, 769-777, 803, 853-856
  hooks/nova_cc_utils 445 112 75% 296-301, 312-315, 325-326, 382, 384, 430-432, 436, 450-458, 465-470, 474-488, 544, 593-595, 600-603, 608, 612, 636-637, 651-653, 674-675, 681-704, 708-714, 718-724, 730, 736, 743, 754-758, 843, 903-909, 913-915, 919-922, 926-938
  TOTAL 1040 367 65%
  Ran 96 tests in 9.180s
  OK

Full unit test output: http://paste.ubuntu.com/9351211/
Build: http://10.98.191.181:8080/job/charm_unit_test/1141/

[uosci-testing-bot (uosci-testing-bot)]

UOSCI bot says:
charm_amulet_test #573 nova-cloud-controller-next for cbjchen mp243440
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv01"
  WARNING cannot delete security group "juju-osci-sv01-0". Used by another environment?
  juju-test INFO : Results: 2 passed, 1 failed, 0 errored
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/9351364/
Build: http://10.98.191.181:8080/job/charm_amulet_test/573/

[Edward Hope-Morley (hopem)]

lgtm, approved. Thanks for fixing liang.

review: Approve

[Edward Hope-Morley (hopem)]

Actually , just spotted an issue. See inline.

review: Needs Fixing

[lp:~cbjchen/charms/trusty/nova-cloud-controller/my_ip_setting]

126. By Liang Chen <email address hidden> on 2014-12-03

set my_ip to an address reachable from outside

[cbjchen,r=]
my_ip can be used by other hosts like a callback.
It needs to be set to a ip address that can reach
to the nova-cc node from other hosts. This patch
will try to use the internal-network address if
applicable, or otherwise the private-address.

[Liang Chen (cbjchen)]

updated. Thanks for spotting it out!

[Edward Hope-Morley (hopem)]

Thanks liang. lgtm, approved.

review: Approve

=== modified file 'hooks/nova_cc_context.py'
--- hooks/nova_cc_context.py	2014-10-13 16:18:58 +0000
+++ hooks/nova_cc_context.py	2014-12-03 23:32:15 +0000
@@ -13,7 +13,13 @@
 )
 
 from charmhelpers.contrib.network.ip import (
-    get_ipv6_addr
+    get_ipv6_addr,
+    format_ipv6_addr
+)
+
+from charmhelpers.contrib.openstack.ip import (
+    resolve_address,
+    INTERNAL,
 )
 
 
@@ -273,6 +279,8 @@
         ctxt = super(NovaConfigContext, self).__call__()
         ctxt['cpu_allocation_ratio'] = config('cpu-allocation-ratio')
         ctxt['ram_allocation_ratio'] = config('ram-allocation-ratio')
+        addr = resolve_address(INTERNAL)
+        ctxt['host_ip'] = format_ipv6_addr(addr) or addr
         return ctxt
 
 

=== modified file 'templates/havana/nova.conf'
--- templates/havana/nova.conf	2014-08-08 09:31:32 +0000
+++ templates/havana/nova.conf	2014-12-03 23:32:15 +0000
@@ -25,6 +25,7 @@
 scheduler_default_filters = RetryFilter,AvailabilityZoneFilter,CoreFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter
 cpu_allocation_ratio = {{ cpu_allocation_ratio }}
 use_syslog={{ use_syslog }}
+my_ip = {{ host_ip }}
 
 {% if keystone_ec2_url -%}
 keystone_ec2_url = {{ keystone_ec2_url }}

=== modified file 'templates/icehouse/nova.conf'
--- templates/icehouse/nova.conf	2014-10-07 11:37:20 +0000
+++ templates/icehouse/nova.conf	2014-12-03 23:32:15 +0000
@@ -24,7 +24,6 @@
 compute_driver=libvirt.LibvirtDriver
 use_ipv6 = {{ use_ipv6 }}
 osapi_compute_listen = {{ bind_host }}
-my_ip = {{ bind_host }}
 metadata_host = {{ bind_host }}
 s3_listen = {{ bind_host }}
 ec2_listen = {{ bind_host }}
@@ -37,6 +36,7 @@
 ram_allocation_ratio = {{ ram_allocation_ratio }}
 
 use_syslog={{ use_syslog }}
+my_ip = {{ host_ip }}
 
 {% if keystone_ec2_url -%}
 keystone_ec2_url = {{ keystone_ec2_url }}

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2014-10-14 15:17:57 +0000
+++ tests/basic_deployment.py	2014-12-03 23:32:15 +0000
@@ -19,7 +19,7 @@
 class NovaCCBasicDeployment(OpenStackAmuletDeployment):
     """Amulet tests on a basic nova cloud controller deployment."""
 
-    def __init__(self, series=None, openstack=None, source=None, stable=False):
+    def __init__(self, series=None, openstack=None, source=None, stable=True):
         """Deploy the entire test environment."""
         super(NovaCCBasicDeployment, self).__init__(series, openstack, source, stable)
         self._add_services()