Implement upgrades, move templates to folsom.

hooks/nova_compute_hooks.py

@@ -61,7 +61,7 @@ def install():
 @restart_on_change(restart_map())
 def config_changed():
     if openstack_upgrade_available('nova-common'):
-        do_openstack_upgrade()
+        do_openstack_upgrade(CONFIGS)
 
     if migration_enabled() and config('migration-auth-type') == 'ssh':
         # Check-in with nova-c-c and register new ssh key, if it has just been

hooks/nova_compute_utils.py

@@ -5,6 +5,8 @@ from base64 import b64decode
 from copy import deepcopy
 from subprocess import check_call, check_output
 
+from charmhelpers.core.host import apt_update, apt_install
+
 from charmhelpers.core.hookenv import (
     config,
     log,
@@ -14,10 +16,14 @@ from charmhelpers.core.hookenv import (
 )
 
 from charmhelpers.contrib.openstack.neutron import neutron_plugin_attribute
-
-from charmhelpers.contrib.openstack.utils import os_release
 from charmhelpers.contrib.openstack import templating, context
 
+from charmhelpers.contrib.openstack.utils import (
+    configure_installation_source,
+    get_os_codename_install_source,
+    os_release
+)
+
 from nova_compute_context import (
     CloudComputeContext,
     NovaComputeLibvirtContext,
@@ -307,7 +313,24 @@ def configure_live_migration(configs=None):
         initialize_ssh_keys()
 
 
-def do_openstack_upgrade():
+def do_openstack_upgrade(configs):
+    new_src = config('openstack-origin')
+    new_os_rel = get_os_codename_install_source(new_src)
+    log('Performing OpenStack upgrade to %s.' % (new_os_rel))
+
+    configure_installation_source(new_src)
+    apt_update()
+
+    dpkg_opts = [
+        '--option', 'Dpkg::Options::=--force-confnew',
+        '--option', 'Dpkg::Options::=--force-confdef',
+    ]
+
+    apt_install(packages=determine_packages(), options=dpkg_opts, fatal=True)
+
+    # set CONFIGS to load templates from new release and regenerate config
+    configs.set_release(openstack_release=new_os_rel)
+    configs.write_all()
     pass
 
 

revision

@@ -1 +1 @@
-126
+128

templates/folsom/nova.conf

@@ -17,41 +17,55 @@ verbose=True
 ec2_private_dns_show_ip=True
 api_paste_config=/etc/nova/api-paste.ini
 volumes_path=/var/lib/nova/volumes
+enabled_apis=ec2,osapi_compute,metadata
+auth_strategy=keystone
+compute_driver=libvirt.LibvirtDriver
 {% if database_host -%}
 sql_connection = mysql://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}
 {% endif -%}
+
 {% if rabbitmq_host -%}
 rabbit_host = {{ rabbitmq_host }}
 rabbit_userid = {{ rabbitmq_user }}
 rabbit_password = {{ rabbitmq_password }}
 rabbit_virtual_host = {{ rabbitmq_virtual_host }}
 {% endif -%}
+
 {% if glance_api_servers -%}
 glance_api_servers = {{ glance_api_servers }}
 {% endif -%}
+
 {% if rbd_pool -%}
 rbd_pool = {{ rbd_pool }}
 rbd_user = {{ rbd_user }}
 rbd_secret_uuid = {{ rbd_secret_uuid }}
 {% endif -%}
-{% if quantum_plugin and quantum_plugin == 'ovs' -%}
-libvirt_vif_driver = {{ libvirt_vif_driver }}
-libvirt_user_virtio_for_bridges = {{ libvirt_use_virtio_for_birdges }}
-{% if quantum_security_groups -%}
+
+{% if neutron_plugin and neutron_plugin == 'ovs' -%}
+libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver
+libvirt_user_virtio_for_bridges =  True
+{% if neutron_security_groups -%}
 security_group_api = quantum
 nova_firewall_driver = nova.virt.firewall.NoopFirewallDriver
 {% endif -%}
 {% endif -%}
+
 {% if network_manager_config -%}
 {% for key, value in network_manager_config.iteritems() -%}
 {{ key }} = {{ value }}
 {% endfor -%}
 {% endif -%}
-{% if volume_service_config -%}
-{% for key, value in volume_service_config.iteritems() -%}
-{{ key }} = {{ value }}
-{% endfor -%}
+
+{% if network_manager == 'quantum' -%}
+network_api_class = nova.network.quantumv2.api.API
+{% else -%}
+network_manager = nova.network.manager.FlatDHCPManager
 {% endif -%}
+
+{% if volume_service -%}
+volume_api_class=nova.volume.cinder.API
+{% endif -%}
+
 {% if user_config_flags -%}
 {% for key, value in user_config_flags.iteritems() -%}
 {{ key }} = {{ value }}

templates/grizzly/nova.conf

@@ -1,73 +0,0 @@
-###############################################################################
-# [ WARNING ]
-# Configuration file maintained by Juju. Local changes may be overwritten.
-###############################################################################
-[DEFAULT]
-dhcpbridge_flagfile=/etc/nova/nova.conf
-dhcpbridge=/usr/bin/nova-dhcpbridge
-logdir=/var/log/nova
-state_path=/var/lib/nova
-lock_path=/var/lock/nova
-force_dhcp_release=True
-iscsi_helper=tgtadm
-libvirt_use_virtio_for_bridges=True
-connection_type=libvirt
-root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
-verbose=True
-ec2_private_dns_show_ip=True
-api_paste_config=/etc/nova/api-paste.ini
-volumes_path=/var/lib/nova/volumes
-enabled_apis=ec2,osapi_compute,metadata
-auth_strategy=keystone
-compute_driver=libvirt.LibvirtDriver
-{% if database_host -%}
-sql_connection = mysql://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}
-{% endif -%}
-
-{% if rabbitmq_host -%}
-rabbit_host = {{ rabbitmq_host }}
-rabbit_userid = {{ rabbitmq_user }}
-rabbit_password = {{ rabbitmq_password }}
-rabbit_virtual_host = {{ rabbitmq_virtual_host }}
-{% endif -%}
-
-{% if glance_api_servers -%}
-glance_api_servers = {{ glance_api_servers }}
-{% endif -%}
-
-{% if rbd_pool -%}
-rbd_pool = {{ rbd_pool }}
-rbd_user = {{ rbd_user }}
-rbd_secret_uuid = {{ rbd_secret_uuid }}
-{% endif -%}
-
-{% if neutron_plugin and neutron_plugin == 'ovs' -%}
-libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver
-libvirt_user_virtio_for_bridges =  True
-{% if neutron_security_groups -%}
-security_group_api = quantum
-nova_firewall_driver = nova.virt.firewall.NoopFirewallDriver
-{% endif -%}
-{% endif -%}
-
-{% if network_manager_config -%}
-{% for key, value in network_manager_config.iteritems() -%}
-{{ key }} = {{ value }}
-{% endfor -%}
-{% endif -%}
-
-{% if network_manager == 'quantum' -%}
-network_api_class = nova.network.quantumv2.api.API
-{% else -%}
-network_manager = nova.network.manager.FlatDHCPManager
-{% endif -%}
-
-{% if volume_service -%}
-volume_api_class=nova.volume.cinder.API
-{% endif -%}
-
-{% if user_config_flags -%}
-{% for key, value in user_config_flags.iteritems() -%}
-{{ key }} = {{ value }}
-{% endfor -%}
-{% endif -%}