Merge lp:~sberg-l/charms/trusty/nova-compute/next into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Skyler Berg]

Add a configuration option for nfs-mount-options. This is necessary for nova to work after configuring cinder to use Tintri as a backend.

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

charm_lint_check #8427 nova-compute-next for sberg-l mp268680
    LINT OK: passed

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

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

charm_unit_test #7821 nova-compute-next for sberg-l mp268680
    UNIT OK: passed

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

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

charm_amulet_test #5934 nova-compute-next for sberg-l mp268680
    AMULET OK: passed

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

[Ryan Beisner (1chb1n)]

Thank you for your work on this.

Since we had been talking in #juju, I wanted to chime in with a few thoughts to help make your project reviews go as smoothly as possible.

I think that my colleagues will like to see and review this in a batch along side any other proposed changes to other charms, so that we can understand and review the changes in full context.

Until a more official review, some things to double-check as potential blockers:

# Config
While I've not taken a deep dive into this, I know that (generally speaking) many config options have been relocated or deprecated, depending on which OpenStack version is in use. So I'd recommend double-checking all of the relevant config options and template placement against the upstream docs, such as:
http://docs.openstack.org/kilo/config-reference/content/list-of-compute-config-options.html
http://docs.openstack.org/juno/config-reference/content/list-of-compute-config-options.html
http://docs.openstack.org/icehouse/config-reference/content/list-of-compute-config-options.html

A couple of questions that jumped out at me after having a quick peek:
Will you also need to enable a volume_driver for nfs in nova.conf?
Will you also need to specify a nfs_mount_point_base in nova.conf?

# Supported Releases
Take note that with each OpenStack charm, we develop and test with the expectation that each charm will succeed on all currently-supported releases. Currently, that is Icehouse, Juno, Kilo, with Liberty up next in active development. As a handy reference, this page has a chart that shows the supported release timeline:
https://wiki.ubuntu.com/ServerTeam/CloudArchive

# Contacts
As you know, you can generally reach one of us in #juju. For a-sync questions, the juju mailing list is also effective in drawing input/feedback with regard to general design questions or issues. I highly recommend joining that, as it's fairly low-traffic, and definitely has the right audience.

https://lists.ubuntu.com/mailman/listinfo/juju

Thanks again!

[Skyler Berg (sberg-l)]

Thanks for the feedback, Ryan!

nfs_mount_options was added to the [libvirt] section of nova.conf in Icehouse and has continued to exist in the all subsequent releases. As such, I added to the templates for all Icehouse, Juno, and Kilo.

I do not need any additional options other than nfs_mount_options.

As for other changes, I do not anticipate any. This change should be isolated. Soon I will be uploading my cinder-tintri charm. In that charm's README I will instruct users to set this option appropriately. However, the code in my charm will not touch nova-compute at all.

[Billy Olsen (billy-olsen)]

Ah this is where you were going with the general config options? From our discussions on IRC, I understood you wanted general config settings set rather than ultimately seeing it this way.

Although, this is certainly one option of solving it, I think you are probably better going down the path of creating a subordinate charm and adding a tintri relation interface. As a simple subordinate charm, it could easily relate to both the nova-compute charm (which would react to tintri-relation-* hooks) and to cinder (also reacting to tintri-relation-* hooks).

For example, let's go with the idea of a tintri-storage charm which is a subordinate. The subordinate means it will be colocated with each unit it is paired with. In this charm, there would be the options for connecting to the tintri storage device (e.g. username, password, ip address, etc). It would provide the tintri interface, which shares access information to the related service (e.g. on the relation it would share the ip, password, etc). Then the nova-compute charm would be augmented to understand the tintri interface. On the tintri-changed-* hook it would read the relation values and configure the local storage access and any nova-compute parameters needed (ideally a new TintriContext or NFSContext etc would be created here), which would also include the NFS mount options etc.

I'm going to mark this as needs fixing as I think you really (ultimately) want what I've outlined here. That is to give the user one place to configure the tintri settings for the environment, and then let the charm relations handle the rest for you.

Ping me (wolsen) on irc if you want to discuss this any further or have questions. I'll be more than happy to help out!

review: Needs Fixing

[Billy Olsen (billy-olsen)]

btw, when it is ready for re-review/re-submission - change the status and add the openstack-charmers to make sure it goes into the general review queue and not just to me.

Unmerged revisions

154. By Skyler Berg on 2015-08-20

Add nfs-mount-options options configuration option

=== modified file 'config.yaml'
--- config.yaml	2015-07-17 08:28:10 +0000
+++ config.yaml	2015-08-21 00:04:45 +0000
@@ -250,3 +250,7 @@
       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.
+  nfs-mount-options:
+    default:
+    type: string
+    description: Mount options passed to the NFS client

=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2015-07-15 08:27:44 +0000
+++ hooks/nova_compute_context.py	2015-08-21 00:04:45 +0000
@@ -124,6 +124,10 @@
         if config('disk-cachemodes'):
             ctxt['disk_cachemodes'] = config('disk-cachemodes')
 
+        if config('nfs-mount-options'):
+            # nova.conf
+            ctxt['nfs_mount_options'] = config('nfs-mount-options')
+
         ctxt['host_uuid'] = '%s' % uuid.uuid4()
         return ctxt
 

=== modified file 'revision'
--- revision	2014-06-02 18:37:32 +0000
+++ revision	2015-08-21 00:04:45 +0000
@@ -1,1 +1,1 @@
-133
+134

=== modified file 'templates/icehouse/nova.conf'
--- templates/icehouse/nova.conf	2015-04-13 12:22:05 +0000
+++ templates/icehouse/nova.conf	2015-08-21 00:04:45 +0000
@@ -152,4 +152,7 @@
 {% if disk_cachemodes -%}
 disk_cachemodes = {{ disk_cachemodes }}
 {% endif -%}
+{% if nfs_mount_options -%}
+nfs_mount_options = {{ nfs_mount_options }}
+{% endif -%}
 

=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	2015-07-07 12:06:07 +0000
+++ templates/juno/nova.conf	2015-08-21 00:04:45 +0000
@@ -156,3 +156,6 @@
 {% if disk_cachemodes -%}
 disk_cachemodes = {{ disk_cachemodes }}
 {% endif -%}
+{% if nfs_mount_options -%}
+nfs_mount_options = {{ nfs_mount_options }}
+{% endif -%}

=== modified file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	2015-07-07 12:06:07 +0000
+++ templates/kilo/nova.conf	2015-08-21 00:04:45 +0000
@@ -161,6 +161,9 @@
 {% if disk_cachemodes -%}
 disk_cachemodes = {{ disk_cachemodes }}
 {% endif -%}
+{% if nfs_mount_options -%}
+nfs_mount_options = {{ nfs_mount_options }}
+{% endif -%}
 
 {% include "parts/section-database" %}