Merge lp:~james-page/charms/trusty/nova-compute/xenial into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[James Page]

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

charm_lint_check #239 nova-compute-next for james-page mp285780
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/239/

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

charm_unit_test #224 nova-compute-next for james-page mp285780
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/224/

[David Ames (thedac)]

Other than the s/kilo/mitaka in the nova.conf template this looks good.

Do we expect the xenial amulet tests to pass as it is dependent on the NUM_CPUS cpu_count() change?

review: Needs Fixing

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

charm_amulet_test #116 nova-compute-next for james-page mp285780
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15020546/
Build: http://10.245.162.36:8080/job/charm_amulet_test/116/

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

charm_amulet_test #122 nova-compute-next for james-page mp285780
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15022817/
Build: http://10.245.162.36:8080/job/charm_amulet_test/122/

[lp:~james-page/charms/trusty/nova-compute/xenial]

195. By James Page on 2016-02-12

Fixup template header

196. By James Page on 2016-02-12

Disable mitaka tests until all merges land

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

charm_lint_check #371 nova-compute-next for james-page mp285780
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/371/

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

charm_unit_test #293 nova-compute-next for james-page mp285780
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/293/

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

charm_amulet_test #147 nova-compute-next for james-page mp285780
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/147/

[David Ames (thedac)]

LGTM, Merging

review: Approve

=== added directory 'templates/mitaka'
=== added file 'templates/mitaka/nova.conf'
--- templates/mitaka/nova.conf	1970-01-01 00:00:00 +0000
+++ templates/mitaka/nova.conf	2016-02-12 12:07:18 +0000
@@ -0,0 +1,185 @@
+# mitaka
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+{% if restart_trigger -%}
+# restart trigger: {{ restart_trigger }}
+{% endif -%}
+###############################################################################
+[DEFAULT]
+verbose={{ verbose }}
+debug={{ debug }}
+dhcpbridge_flagfile=/etc/nova/nova.conf
+dhcpbridge=/usr/bin/nova-dhcpbridge
+logdir=/var/log/nova
+state_path=/var/lib/nova
+force_dhcp_release=True
+use_syslog = {{ use_syslog }}
+ec2_private_dns_show_ip=True
+api_paste_config=/etc/nova/api-paste.ini
+enabled_apis=ec2,osapi_compute,metadata
+auth_strategy=keystone
+my_ip = {{ host_ip }}
+
+{% if arch == 'aarch64' -%}
+libvirt_use_virtio_for_bridges=False
+libvirt_disk_prefix=vd
+{% endif -%}
+
+{% if console_vnc_type -%}
+vnc_enabled = True
+novnc_enabled = True
+vnc_keymap = {{ console_keymap }}
+vncserver_listen = 0.0.0.0
+vncserver_proxyclient_address = {{ console_listen_addr }}
+{% if console_access_protocol == 'novnc' or console_access_protocol == 'vnc' -%}
+novncproxy_base_url = {{ novnc_proxy_address }}
+{% endif -%}
+{% if console_access_protocol == 'xvpvnc' or console_access_protocol == 'vnc' -%}
+xvpvncproxy_port = {{ xvpvnc_proxy_port }}
+xvpvncproxy_host = {{ xvpvnc_proxy_host }}
+xvpvncproxy_base_url = {{ xvpvnc_proxy_address }}
+{% endif -%}
+{% else -%}
+vnc_enabled = False
+novnc_enabled = False
+{% endif -%}
+
+{% if neutron_plugin and neutron_plugin in ('ovs', 'midonet') -%}
+libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver
+{% if neutron_security_groups -%}
+security_group_api = neutron
+firewall_driver = nova.virt.firewall.NoopFirewallDriver
+{% endif -%}
+{% endif -%}
+
+{% if neutron_plugin and neutron_plugin == 'vsp' -%}
+network_api_class=nova.network.neutronv2.api.API
+libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtGenericVIFDriver
+neutron_ovs_bridge=alubr0
+security_group_api=nova
+firewall_driver = nova.virt.firewall.NoopFirewallDriver
+{% endif -%}
+
+{% if neutron_plugin and (neutron_plugin == 'nvp' or neutron_plugin == 'nsx') -%}
+libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtOpenVswitchVirtualPortDriver
+security_group_api = neutron
+firewall_driver = nova.virt.firewall.NoopFirewallDriver
+{% endif -%}
+
+{% if neutron_plugin and neutron_plugin == 'Calico' -%}
+security_group_api = neutron
+firewall_driver = nova.virt.firewall.NoopFirewallDriver
+{% endif -%}
+
+{% if neutron_plugin and neutron_plugin == 'plumgrid' -%}
+security_group_api=neutron
+firewall_driver = nova.virt.firewall.NoopFirewallDriver
+{% endif -%}
+
+{% if network_manager != 'neutron' and network_manager_config -%}
+{% for key, value in network_manager_config.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+
+{% if network_manager == 'neutron' -%}
+network_api_class = nova.network.neutronv2.api.API
+{% else -%}
+network_manager = nova.network.manager.FlatDHCPManager
+{% endif -%}
+
+{% if network_device_mtu -%}
+network_device_mtu = {{ network_device_mtu }}
+{% 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 -%}
+
+{% if instances_path -%}
+instances_path = {{ instances_path }}
+{% endif -%}
+
+{% if sections and 'DEFAULT' in sections -%}
+{% for key, value in sections['DEFAULT'] -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+
+{% include "section-zeromq" %}
+
+{% if network_manager == 'neutron' and network_manager_config -%}
+[neutron]
+url = {{ network_manager_config.neutron_url }}
+{% if network_manager_config.keystone_host -%}
+{% if neutron_plugin and neutron_plugin == 'vsp' -%}
+ovs_bridge = alubr0
+{% endif -%}
+auth_plugin = password
+project_name = {{ network_manager_config.neutron_admin_tenant_name }}
+username = {{ network_manager_config.neutron_admin_username }}
+password = {{ network_manager_config.neutron_admin_password }}
+auth_url = {{ network_manager_config.auth_protocol }}://{{ network_manager_config.keystone_host }}:{{ network_manager_config.auth_port }}
+region = {{ region }}
+{% if metadata_shared_secret -%}
+metadata_proxy_shared_secret = {{ metadata_shared_secret }}
+service_metadata_proxy=True
+{% endif -%}
+{% endif -%}
+{% endif -%}
+
+{% if glance_api_servers -%}
+[glance]
+api_servers = {{ glance_api_servers }}
+{% endif -%}
+
+{% if console_access_protocol == 'spice' -%}
+[spice]
+agent_enabled = True
+enabled = True
+html5proxy_base_url = {{ spice_proxy_address }}
+keymap = {{ console_keymap }}
+server_listen = 0.0.0.0
+server_proxyclient_address = {{ console_listen_addr }}
+{% endif -%}
+
+[libvirt]
+{% if cpu_mode -%}
+cpu_mode = {{ cpu_mode }}
+{% endif -%}
+{% if cpu_model -%}
+cpu_model = {{ cpu_model }}
+{% endif -%}
+{% if libvirt_images_type -%}
+images_type = {{ libvirt_images_type }}
+images_rbd_pool = {{ rbd_pool }}
+images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
+inject_password=false
+inject_key=false
+inject_partition=-2
+{% endif -%}
+{% if rbd_pool -%}
+rbd_pool = {{ rbd_pool }}
+rbd_user = {{ rbd_user }}
+rbd_secret_uuid = {{ rbd_secret_uuid }}
+{% endif -%}
+{% if live_migration_uri -%}
+live_migration_uri = {{ live_migration_uri }}
+{% endif -%}
+{% if disk_cachemodes -%}
+disk_cachemodes = {{ disk_cachemodes }}
+{% endif -%}
+
+{% include "parts/section-database" %}
+
+{% include "section-rabbitmq-oslo" %}
+
+[oslo_concurrency]
+lock_path=/var/lock/nova