Merge lp:~marcoceppi/charms/trusty/nova-compute/trunk into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Marco Ceppi]

Add support for iscsi_use_multipath and use_cow_images in kilo and juno

This enables cinder-vnx and cinder-xtremio support for nova-compute by allowing the admin to enable/disable iscsi_use_multipath and use_cow_images which are required to be set for these two charms.

cs:~marcoceppi/trusty/cinder-vnx
cs:~marcoceppi/trusty/cinder-xtremio

I'd like, while being reviewed, if this change could be considered for a stable backport to the 15.04 OpenStack charms as there are solutions being published *soon* which reference these with the current release of the the OpenStack charms

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

charm_lint_check #4541 nova-compute-next for marcoceppi mp259139
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/4541/

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

charm_unit_test #4266 nova-compute-next for marcoceppi mp259139
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/4266/

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

charm_amulet_test #4120 nova-compute-next for marcoceppi mp259139
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/4120/

[Ryan Beisner (1chb1n)]

Thank you for working on this. Some early input for you:

While this does pass CI, we won't be able to merge it into next as-is, because this MP is flipping stable bits on the next branch, pulling in some other uncommitted changes, and has a conflict.

I think it would be best to re-base from nova-compute/next and re-propose. It may also be worth adding contexts unit_test coverage for the new config options.

[Marco Ceppi (marcoceppi)]

Thanks for the feedback, I'll rebase this on top of next and start working on testing

[James Page (james-page)]

Please set back to 'Needs Review' when this is ready for landing.

Unmerged revisions

136. By Marco Ceppi on 2015-05-06

Updated categories to tags

135. By Marco Ceppi on 2015-05-06

Ability to use cow-images as config

134. By Marco Ceppi on 2015-04-30

Add iscsi_use_multipath support for kilo and juno templates

133. By Marco Ceppi on 2015-04-30

Use text not booleans

132. By Marco Ceppi on 2015-04-29

Add iscsi_use_multipath support for libvirt

131. By Corey Bryant on 2015-04-28

[corey.bryant,trivial] Fix deploy from source README

130. By Billy Olsen on 2015-04-24

[niedbalski,r=wolsen] Check nrpe relation is made before configuring nrpe

Fixes-Bug: LP #1448143

129. By Liam Young on 2015-04-24

Point charmhelper sync and amulet tests at stable branches

=== modified file 'README.md'
--- README.md	2015-04-30 12:09:23 +0000
+++ README.md	2015-05-14 16:27:41 +0000
@@ -36,6 +36,7 @@
 
 The minimum openstack-origin-git config required to deploy from source is:
 
+<<<<<<< TREE
     openstack-origin-git: include-file://nova-juno.yaml
 
     nova-juno.yaml
@@ -46,6 +47,16 @@
         - {name: nova,
            repository: 'git://github.com/openstack/nova',
            branch: stable/juno}
+=======
+    openstack-origin-git:
+        "repositories:
+         - {name: requirements,
+            repository: 'git://git.openstack.org/openstack/requirements',
+            branch: stable/juno}
+         - {name: nova,
+            repository: 'git://git.openstack.org/openstack/nova',
+            branch: stable/juno}"
+>>>>>>> MERGE-SOURCE
 
 Note that there are only two 'name' values the charm knows about: 'requirements'
 and 'nova'. These repositories must correspond to these 'name' values.
@@ -55,6 +66,7 @@
 
 The following is a full list of current tip repos (may not be up-to-date):
 
+<<<<<<< TREE
     openstack-origin-git: include-file://nova-master.yaml
 
     nova-master.yaml
@@ -119,3 +131,67 @@
         - {name: nova,
            repository: 'git://github.com/openstack/nova',
            branch: master}
+=======
+    openstack-origin-git:
+        "repositories:
+         - {name: requirements,
+            repository: 'git://git.openstack.org/openstack/requirements',
+            branch: master}
+         - {name: oslo-concurrency,
+            repository: 'git://git.openstack.org/openstack/oslo.concurrency',
+            branch: master}
+         - {name: oslo-config,
+            repository: 'git://git.openstack.org/openstack/oslo.config',
+            branch: master}
+         - {name: oslo-context,
+            repository: 'git://git.openstack.org/openstack/oslo.context.git',
+            branch: master}
+         - {name: oslo-db,
+            repository: 'git://git.openstack.org/openstack/oslo.db',
+            branch: master}
+         - {name: oslo-i18n,
+            repository: 'git://git.openstack.org/openstack/oslo.i18n',
+            branch: master}
+         - {name: oslo-log,
+            repository: 'git://git.openstack.org/openstack/oslo.log',
+            branch: master}
+         - {name: oslo-messaging,
+            repository: 'git://git.openstack.org/openstack/oslo.messaging.git',
+            branch: master}
+         - {name: oslo-middleware,
+            repository': 'git://git.openstack.org/openstack/oslo.middleware.git',
+            branch: master}
+         - {name: oslo-rootwrap',
+            repository: 'git://git.openstack.org/openstack/oslo.rootwrap.git',
+            branch: master}
+         - {name: oslo-serialization,
+            repository: 'git://git.openstack.org/openstack/oslo.serialization',
+            branch: master}
+         - {name: oslo-utils,
+            repository: 'git://git.openstack.org/openstack/oslo.utils',
+            branch: master}
+         - {name: pbr,
+            repository: 'git://git.openstack.org/openstack-dev/pbr',
+            branch: master}
+         - {name: stevedore,
+            repository: 'git://git.openstack.org/openstack/stevedore.git',
+            branch: 'master'}
+         - {name: sqlalchemy-migrate,
+            repository: 'git://git.openstack.org/stackforge/sqlalchemy-migrate',
+            branch: master}
+         - {name: python-cinderclient,
+            repository: 'git://git.openstack.org/openstack/python-cinderclient.git',
+            branch: master}
+         - {name: python-glanceclient,
+            repository': 'git://git.openstack.org/openstack/python-glanceclient.git',
+            branch: master}
+         - {name: python-neutronlient,
+            repository': 'git://git.openstack.org/openstack/python-neutronclient.git',
+            branch: master}
+         - {name: keystonemiddleware,
+            repository: 'git://git.openstack.org/openstack/keystonemiddleware',
+            branch: master}
+         - {name: nova,
+            repository: 'git://git.openstack.org/openstack/nova',
+            branch: master}"
+>>>>>>> MERGE-SOURCE

=== modified file 'charm-helpers-hooks.yaml'
--- charm-helpers-hooks.yaml	2015-03-31 15:01:48 +0000
+++ charm-helpers-hooks.yaml	2015-05-14 16:27:41 +0000
@@ -1,4 +1,4 @@
-branch: lp:charm-helpers
+branch: lp:~openstack-charmers/charm-helpers/stable
 destination: hooks/charmhelpers
 include:
     - core

=== modified file 'charm-helpers-tests.yaml'
--- charm-helpers-tests.yaml	2015-03-16 15:38:04 +0000
+++ charm-helpers-tests.yaml	2015-05-14 16:27:41 +0000
@@ -1,4 +1,4 @@
-branch: lp:charm-helpers
+branch: lp:~openstack-charmers/charm-helpers/stable
 destination: tests/charmhelpers
 include:
     - contrib.amulet

=== modified file 'config.yaml'
--- config.yaml	2015-04-22 09:21:01 +0000
+++ config.yaml	2015-05-14 16:27:41 +0000
@@ -228,3 +228,11 @@
       stipulated by nova-cloud-controller. The option is only available for
       backward compatibility for deployments which do not use the neutron-api
       charm. Please do not enable this on new deployments.
+  iscsi-use-multipath:
+    type: boolean
+    default: False
+    description: Use multipath connection of the iSCSI volume
+  use-cow-images:
+    type: boolean
+    default: False
+    description: Use COW images for libvirt

=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2015-03-31 13:22:53 +0000
+++ hooks/nova_compute_context.py	2015-05-14 16:27:41 +0000
@@ -114,6 +114,12 @@
         if config('migration-auth-type') in ['none', 'None', 'ssh']:
             ctxt['listen_tls'] = 0
 
+        if config('use-cow-images'):
+            ctxt['use_cow_images'] = 'True'
+
+        if config('iscsi-use-multipath'):
+            ctxt['iscsi_use_multipath'] = 'True'
+
         if config('migration-auth-type') == 'ssh':
             # nova.conf
             ctxt['live_migration_uri'] = 'qemu+ssh://%s/system'

=== modified file 'hooks/nova_compute_hooks.py'
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-04-13 12:46:16 +0000
+++ metadata.yaml	2015-05-14 16:27:41 +0000
@@ -5,7 +5,7 @@
  OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
  addition to its "native" API (the OpenStack API), it also supports the Amazon
  EC2 API.
-categories:
+tags:
   - openstack
 provides:
   cloud-compute:

=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	2015-04-13 12:22:05 +0000
+++ templates/juno/nova.conf	2015-05-14 16:27:41 +0000
@@ -31,6 +31,10 @@
 compute_driver=libvirt.LibvirtDriver
 my_ip = {{ host_ip }}
 
+{% if use_cow_images -%}
+use_cow_images={{ use_cow_images }}
+{% endif -%}
+
 {% include "parts/database" %}
 
 {% include "parts/rabbitmq" %}
@@ -152,3 +156,6 @@
 {% if disk_cachemodes -%}
 disk_cachemodes = {{ disk_cachemodes }}
 {% endif -%}
+{% if iscsi_use_multipath -%}
+iscsi_use_multipath=true
+{% endif -%}

=== modified file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	2015-04-22 09:21:01 +0000
+++ templates/kilo/nova.conf	2015-05-14 16:27:41 +0000
@@ -157,6 +157,9 @@
 {% if disk_cachemodes -%}
 disk_cachemodes = {{ disk_cachemodes }}
 {% endif -%}
+{% if iscsi_use_multipath -%}
+iscsi_use_multipath=true
+{% endif -%}
 
 {% include "parts/section-database" %}
 

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-04-16 21:31:33 +0000
+++ tests/basic_deployment.py	2015-05-14 16:27:41 +0000
@@ -23,7 +23,7 @@
     """Amulet tests on a basic nova compute deployment."""
 
     def __init__(self, series=None, openstack=None, source=None, git=False,
-                 stable=False):
+                 stable=True):
         """Deploy the entire test environment."""
         super(NovaBasicDeployment, self).__init__(series, openstack, source, stable)
         self.git = git