Merge lp:~james-page/charms/trusty/nova-cloud-controller/kilo-support into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[James Page]

[lp:~james-page/charms/trusty/nova-cloud-controller/kilo-support]

140. By James Page on 2015-01-21

Mark template as for kilo

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

charm_lint_check #926 nova-cloud-controller-next for james-page mp247107
    LINT OK: passed

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

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

charm_unit_test #955 nova-cloud-controller-next for james-page mp247107
    UNIT OK: passed

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

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

charm_amulet_test #1148 nova-cloud-controller-next for james-page mp247107
    AMULET OK: passed

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

[Ryan Beisner (1chb1n)]

FYI, all deploy tests are happy. [P-I, T-I, T-J, U-J] x [Stable & Next] charms.

[Liam Young (gnuoy)]

Approve

review: Approve

=== added directory 'templates/kilo'
=== added file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	1970-01-01 00:00:00 +0000
+++ templates/kilo/nova.conf	2015-01-21 09:24:37 +0000
@@ -0,0 +1,151 @@
+# kilo
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+[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
+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
+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
+use_ipv6 = {{ use_ipv6 }}
+osapi_compute_listen = {{ bind_host }}
+metadata_host = {{ bind_host }}
+s3_listen = {{ bind_host }}
+ec2_listen = {{ bind_host }}
+
+osapi_compute_workers = {{ workers }}
+ec2_workers = {{ workers }}
+
+scheduler_default_filters = RetryFilter,AvailabilityZoneFilter,CoreFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter
+cpu_allocation_ratio = {{ cpu_allocation_ratio }}
+ram_allocation_ratio = {{ ram_allocation_ratio }}
+
+use_syslog={{ use_syslog }}
+my_ip = {{ host_ip }}
+
+{% if memcached_servers %}
+memcached_servers = {{ memcached_servers }}
+{% endif %}
+
+{% if keystone_ec2_url -%}
+keystone_ec2_url = {{ keystone_ec2_url }}
+{% endif -%}
+
+{% include "parts/rabbitmq" %}
+
+{% 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 = {{ network_manager }}
+nova_firewall_driver = nova.virt.firewall.NoopFirewallDriver
+{% endif -%}
+{% if external_network -%}
+default_floating_pool = {{ external_network }}
+{% endif -%}
+{% endif -%}
+
+{% if neutron_plugin and neutron_plugin == 'nvp' -%}
+security_group_api = neutron
+nova_firewall_driver = nova.virt.firewall.NoopFirewallDriver
+{% if external_network -%}
+default_floating_pool = {{ external_network }}
+{% endif -%}
+{% endif -%}
+
+{% if network_manager_config -%}
+{% for key, value in network_manager_config.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+
+{% if network_manager and network_manager == 'neutron' -%}
+network_api_class = nova.network.neutronv2.api.API
+{% else -%}
+network_manager = nova.network.manager.FlatDHCPManager
+{% endif -%}
+
+{% if default_floating_pool -%}
+default_floating_pool = {{ default_floating_pool }}
+{% 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 listen_ports -%}
+{% for key, value in listen_ports.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+
+{% if sections and 'DEFAULT' in sections -%}
+{% for key, value in sections['DEFAULT'] -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif %}
+
+{% include "parts/database-v2" %}
+
+{% if glance_api_servers -%}
+[glance]
+api_servers = {{ glance_api_servers }}
+{% endif -%}
+
+{% if network_manager and network_manager == 'neutron' -%}
+[neutron]
+url = {{ neutron_url }}
+{% if auth_host -%}
+auth_strategy = keystone
+admin_tenant_name = {{ admin_tenant_name }}
+admin_username = {{ admin_user }}
+admin_password = {{ admin_password }}
+admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
+{% endif -%}
+{% endif -%}
+
+{% if auth_host -%}
+[keystone_authtoken]
+auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/
+auth_host = {{ auth_host }}
+auth_port = {{ auth_port }}
+auth_protocol = {{ auth_protocol }}
+admin_tenant_name = {{ admin_tenant_name }}
+admin_user = {{ admin_user }}
+admin_password = {{ admin_password }}
+{% endif -%}
+
+[osapi_v3]
+enabled=True
+
+{% include "parts/cell" %}
+
+[conductor]
+workers = {{ workers }}