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

[Liang Chen]

The default value for my_ip can be problematic. The ip address assocated with the NIC leading to the default gateway may not be the desired one for openstack service communication. Setting it to the unit private-address, so that all the inter service communications use the same network - we alreay use the unit private-address as service endpoint IPs. This patch creates a dedicate context for the host_ip, because it doesn't seem to naturally fit into any existing ones.

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

UOSCI bot says:
charm_lint_check #1108 nova-compute-next for cbjchen mp241975
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-data-network has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option instances-path has no default value
  W: config.yaml: option disable-neutron-security-groups has no default value
  I: config.yaml: option migration-auth-type has no default value

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

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

UOSCI bot says:
charm_unit_test #942 nova-compute-next for cbjchen mp241975
    UNIT OK: passed

UNIT Results (max last 5 lines):
  nova_compute_hooks 132 13 90% 79, 97-98, 125, 191, 249, 254-255, 261, 265-268
  nova_compute_utils 228 110 52% 163-219, 227, 232-235, 270-272, 279, 283-286, 294-302, 306, 315-324, 337-356, 382-383, 387-388, 407-428, 445-455, 469-470, 475-476
  TOTAL 571 193 66%
  Ran 57 tests in 3.409s
  OK (SKIP=5)

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

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

UOSCI bot says:
charm_amulet_test #450 nova-compute-next for cbjchen mp241975
    AMULET OK: passed

AMULET Results (max last 5 lines):
  juju-test.conductor.15-basic-trusty-icehouse RESULT :
  juju-test.conductor DEBUG : Tearing down osci-sv07 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 3 passed, 0 failed, 0 errored

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

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

87. By Liam Young on 2014-11-25

[mthaddon,r=gnuoy] Allow for disk_cachemodes to be set via a config option

[Edward Hope-Morley (hopem)]

Liang, as discussed earlier can you conform whether or not this is supposed to be used in the same way as in nova-cloud-controller (to which my_ip support was added a few commits back) which uses bing_host for my_ip.

[Liang Chen (cbjchen)]

Hi Edward,

Here is the official definition of this config option.
# IP address of this host (string value)
#my_ip=10.0.0.1

I think they are used in the same way - as the IP address of the host. It's used in several different places. Below is a rough summary of its usage on both compute and controller nodes.

========================= compute usage =========================
./nova/compute/resource_tracker.py:60:CONF.import_opt('my_ip', 'nova.netconf')
./nova/compute/resource_tracker.py:278: metrics_info['host_ip'] = CONF.my_ip
./nova/compute/resource_tracker.py:301: resources['host_ip'] = CONF.my_ip

update resource info in the database - compute_nodes.host_ip

./nova/virt/libvirt/driver.py:266:CONF.import_opt('my_ip', 'nova.netconf')
./nova/virt/libvirt/driver.py:1160: connector = {'ip': CONF.my_ip,
./nova/virt/libvirt/driver.py:2389: return CONF.my_ip

used as an argument when terminating a volume connection - volume drivers may or may not use it,
and also used to compare with migration destination host to see if a storage is shared with the destination while migrating disk

./nova/virt/hyperv/hostops.py:32:CONF.import_opt('my_ip', 'nova.netconf')
./nova/virt/hyperv/hostops.py:175: host_ip = CONF.my_ip

has reference to it, but doesn't seem to use it anymore

./nova/virt/hyperv/volumeops.py:55:CONF.import_opt('my_ip', 'nova.netconf')
./nova/virt/hyperv/volumeops.py:203: 'ip': CONF.my_ip,

used while composing volume connection param dictionary

./nova/virt/baremetal/driver.py:76:CONF.import_opt('my_ip', 'nova.netconf')

has reference to it, but doesn't seem to use it anymore

./nova/virt/baremetal/volume_driver.py:198: 'ip': CONF.my_ip,

used while composing volume connection param dictionary

./nova/virt/baremetal/pxe.py:356: 'opt_value': CONF.my_ip},
./nova/virt/baremetal/pxe.py:358: 'opt_value': CONF.my_ip}

used as a option for dhcp while creating an instance

./nova/virt/vmwareapi/vmops.py:70:CONF.import_opt('my_ip', 'nova.netconf')
./nova/virt/vmwareapi/vmops.py:101: self._base_folder = '%s%s' % (CONF.my_ip,

========================= controller usage =========================

used as part of the base folder name for image cache

./nova/network/linux_net.py:62: default='$my_ip',
./nova/network/linux_net.py:108: default='$my_ip',
./nova/network/linux_net.py:138:CONF.import_opt('my_ip', 'nova.netconf')

used as default values for routing_source_ip(Public IP of network host) and metadata_host(The IP address for the metadata API server)

./nova/network/manager.py:108: default='$my_ip',
./nova/network/manager.py:169:CONF.import_opt('my_ip', 'nova.netconf')

used as default values for vpn_ip(Public IP for the cloudpipe VPN servers)

./nova/image/s3.py:48: default='$my_ip',
./nova/image/s3.py:71:CONF.import_opt('my_ip', 'nova.netconf')

used as a parameter while creating connection with s3 compatible service - swfit

./nova/image/glance.py:44: default='$my_ip',
./nova/image/glance.py:76:CONF.import_opt('my_ip', 'nova.netconf')

used as default value of glance_ho...

[Edward Hope-Morley (hopem)]

Thanks Liang, this makes sense. I think we will need to fix this as well:

http://bazaar.launchpad.net/~openstack-charmers/charms/trusty/nova-cloud-controller/trunk/view/head:/templates/icehouse/nova.conf#L27

Also, we will need to make sure this plays well with network splits.

[Liang Chen (cbjchen)]

Hi Edward,
As we discussed, I will make the patch for nova-cc as well after making sure the nova-compute patch works. Thanks.

[Liang Chen (cbjchen)]

Needs to take config('prefer-ipv6') into consideration. will update

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

UOSCI bot says:
charm_lint_check #1235 nova-compute-next for cbjchen mp241975
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option instances-path has no default value
  W: config.yaml: option disable-neutron-security-groups has no default value
  I: config.yaml: option migration-auth-type has no default value
  I: config.yaml: option disk-cachemodes has no default value

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

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

UOSCI bot says:
charm_unit_test #1069 nova-compute-next for cbjchen mp241975
    UNIT OK: passed

UNIT Results (max last 5 lines):
  nova_compute_hooks 132 13 90% 79, 97-98, 125, 191, 249, 254-255, 261, 265-268
  nova_compute_utils 228 110 52% 163-219, 227, 232-235, 270-272, 279, 283-286, 294-302, 306, 315-324, 337-356, 382-383, 387-388, 407-428, 445-455, 469-470, 475-476
  TOTAL 575 194 66%
  Ran 58 tests in 3.325s
  OK (SKIP=5)

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

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

UOSCI bot says:
charm_amulet_test #538 nova-compute-next for cbjchen mp241975
    AMULET OK: passed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Tearing down osci-sv05 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv05"
  WARNING cannot delete security group "juju-osci-sv05-0". Used by another environment?
  WARNING cannot delete security group "juju-osci-sv05". Used by another environment?
  juju-test INFO : Results: 3 passed, 0 failed, 0 errored

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

[Edward Hope-Morley (hopem)]

I've tested this works fine for ipv4 but needs fixing for ipv6 case. See inline comment.

review: Needs Fixing

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

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

set my_ip to unit private-address

[cbjchen,r=]
The default value for my_ip can be problematic.
The ip assocated with the NIC leading to the
default gateway may not be the desired one for
openstack service communication. Setting it to
the unit private-address, so that all the inter
service communications use the same network -
we alreay use the unit private-address as
service endpoint IPs.

[Liang Chen (cbjchen)]

Hi Edward,
Thanks for the comment. Patch updated accordingly.

[Edward Hope-Morley (hopem)]

Thanks liang. lgtm, approved.

review: Approve

=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2014-11-25 15:10:52 +0000
+++ hooks/nova_compute_context.py	2014-12-03 23:25:03 +0000
@@ -17,7 +17,12 @@
 
 from charmhelpers.contrib.openstack.utils import get_host_ip, os_release
 from charmhelpers.contrib.network.ovs import add_bridge
-from charmhelpers.contrib.network.ip import get_address_in_network
+
+from charmhelpers.contrib.network.ip import (
+    get_address_in_network,
+    get_ipv6_addr,
+    format_ipv6_addr,
+)
 
 # This is just a label and it must be consistent across
 # nova-compute nodes to support live migration.
@@ -394,3 +399,15 @@
             ctxt['disable_neutron_security_groups'] = \
                 config('disable-neutron-security-groups')
         return ctxt
+
+
+class HostIPContext(context.OSContextGenerator):
+    def __call__(self):
+        ctxt = {}
+        if config('prefer-ipv6'):
+            host_ip = get_ipv6_addr()[0]
+        else:
+            host_ip = get_host_ip(unit_get('private-address'))
+        if host_ip:
+            ctxt['host_ip'] = format_ipv6_addr(host_ip) or host_ip
+        return ctxt

=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2014-11-28 14:31:49 +0000
+++ hooks/nova_compute_utils.py	2014-12-03 23:25:03 +0000
@@ -43,6 +43,7 @@
     NovaComputeCephContext,
     NeutronComputeContext,
     InstanceConsoleContext,
+    HostIPContext,
 )
 
 CA_CERT_PATH = '/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt'
@@ -89,7 +90,8 @@
                          interface='nova-ceilometer',
                          service='nova',
                          config_file=NOVA_CONF),
-                     InstanceConsoleContext(), ],
+                     InstanceConsoleContext(),
+                     HostIPContext(), ],
     },
 }
 

=== modified file 'templates/havana/nova.conf'
--- templates/havana/nova.conf	2014-11-12 14:47:04 +0000
+++ templates/havana/nova.conf	2014-12-03 23:25:03 +0000
@@ -21,6 +21,7 @@
 enabled_apis=ec2,osapi_compute,metadata
 auth_strategy=keystone
 compute_driver=libvirt.LibvirtDriver
+my_ip = {{ host_ip }}
 
 {% include "parts/database" %}
 

=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	2014-11-25 15:10:52 +0000
+++ templates/juno/nova.conf	2014-12-03 23:25:03 +0000
@@ -21,6 +21,7 @@
 enabled_apis=ec2,osapi_compute,metadata
 auth_strategy=keystone
 compute_driver=libvirt.LibvirtDriver
+my_ip = {{ host_ip }}
 
 {% include "parts/database" %}
 

=== modified file 'unit_tests/test_nova_compute_contexts.py'
--- unit_tests/test_nova_compute_contexts.py	2014-11-25 14:44:46 +0000
+++ unit_tests/test_nova_compute_contexts.py	2014-12-03 23:25:03 +0000
@@ -15,6 +15,7 @@
     'log',
     'os_release',
     '_save_flag_file',
+    'unit_get',
 ]
 
 QUANTUM_CONTEXT = {
@@ -203,3 +204,12 @@
         with patch.object(qplugin, '_ensure_packages'):
             self.assertEquals({'disable_neutron_security_groups': False},
                               qplugin())
+
+    @patch('subprocess.call')
+    def test_host_IP_context(self, _call):
+        self.log = fake_log
+        self.unit_get.return_value = '172.24.0.79'
+        host_ip = context.HostIPContext()
+        self.assertEquals(
+            {'host_ip': '172.24.0.79'}, host_ip())
+        self.unit_get.assert_called_with('private-address')