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

Proposed by James Page
Status: Merged
Merged at revision: 194
Proposed branch: lp:~james-page/charms/trusty/nova-compute/xenial
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 190 lines (+185/-0)
1 file modified
templates/mitaka/nova.conf (+185/-0)
To merge this branch: bzr merge lp:~james-page/charms/trusty/nova-compute/xenial
Reviewer Review Type Date Requested Status
David Ames (community) Approve
Review via email: mp+285780@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
David Ames (thedac) wrote :

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
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

195. By James Page

Fixup template header

196. By James Page

Disable mitaka tests until all merges land

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
David Ames (thedac) wrote :

LGTM, Merging

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1# mitaka
2###############################################################################
3# [ WARNING ]
4# Configuration file maintained by Juju. Local changes may be overwritten.
5{% if restart_trigger -%}
6# restart trigger: {{ restart_trigger }}
7{% endif -%}
8###############################################################################
9[DEFAULT]
10verbose={{ verbose }}
11debug={{ debug }}
12dhcpbridge_flagfile=/etc/nova/nova.conf
13dhcpbridge=/usr/bin/nova-dhcpbridge
14logdir=/var/log/nova
15state_path=/var/lib/nova
16force_dhcp_release=True
17use_syslog = {{ use_syslog }}
18ec2_private_dns_show_ip=True
19api_paste_config=/etc/nova/api-paste.ini
20enabled_apis=ec2,osapi_compute,metadata
21auth_strategy=keystone
22my_ip = {{ host_ip }}
23
24{% if arch == 'aarch64' -%}
25libvirt_use_virtio_for_bridges=False
26libvirt_disk_prefix=vd
27{% endif -%}
28
29{% if console_vnc_type -%}
30vnc_enabled = True
31novnc_enabled = True
32vnc_keymap = {{ console_keymap }}
33vncserver_listen = 0.0.0.0
34vncserver_proxyclient_address = {{ console_listen_addr }}
35{% if console_access_protocol == 'novnc' or console_access_protocol == 'vnc' -%}
36novncproxy_base_url = {{ novnc_proxy_address }}
37{% endif -%}
38{% if console_access_protocol == 'xvpvnc' or console_access_protocol == 'vnc' -%}
39xvpvncproxy_port = {{ xvpvnc_proxy_port }}
40xvpvncproxy_host = {{ xvpvnc_proxy_host }}
41xvpvncproxy_base_url = {{ xvpvnc_proxy_address }}
42{% endif -%}
43{% else -%}
44vnc_enabled = False
45novnc_enabled = False
46{% endif -%}
47
48{% if neutron_plugin and neutron_plugin in ('ovs', 'midonet') -%}
49libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver
50{% if neutron_security_groups -%}
51security_group_api = neutron
52firewall_driver = nova.virt.firewall.NoopFirewallDriver
53{% endif -%}
54{% endif -%}
55
56{% if neutron_plugin and neutron_plugin == 'vsp' -%}
57network_api_class=nova.network.neutronv2.api.API
58libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtGenericVIFDriver
59neutron_ovs_bridge=alubr0
60security_group_api=nova
61firewall_driver = nova.virt.firewall.NoopFirewallDriver
62{% endif -%}
63
64{% if neutron_plugin and (neutron_plugin == 'nvp' or neutron_plugin == 'nsx') -%}
65libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtOpenVswitchVirtualPortDriver
66security_group_api = neutron
67firewall_driver = nova.virt.firewall.NoopFirewallDriver
68{% endif -%}
69
70{% if neutron_plugin and neutron_plugin == 'Calico' -%}
71security_group_api = neutron
72firewall_driver = nova.virt.firewall.NoopFirewallDriver
73{% endif -%}
74
75{% if neutron_plugin and neutron_plugin == 'plumgrid' -%}
76security_group_api=neutron
77firewall_driver = nova.virt.firewall.NoopFirewallDriver
78{% endif -%}
79
80{% if network_manager != 'neutron' and network_manager_config -%}
81{% for key, value in network_manager_config.iteritems() -%}
82{{ key }} = {{ value }}
83{% endfor -%}
84{% endif -%}
85
86{% if network_manager == 'neutron' -%}
87network_api_class = nova.network.neutronv2.api.API
88{% else -%}
89network_manager = nova.network.manager.FlatDHCPManager
90{% endif -%}
91
92{% if network_device_mtu -%}
93network_device_mtu = {{ network_device_mtu }}
94{% endif -%}
95
96{% if volume_service -%}
97volume_api_class = nova.volume.cinder.API
98{% endif -%}
99
100{% if user_config_flags -%}
101{% for key, value in user_config_flags.iteritems() -%}
102{{ key }} = {{ value }}
103{% endfor -%}
104{% endif -%}
105
106{% if instances_path -%}
107instances_path = {{ instances_path }}
108{% endif -%}
109
110{% if sections and 'DEFAULT' in sections -%}
111{% for key, value in sections['DEFAULT'] -%}
112{{ key }} = {{ value }}
113{% endfor -%}
114{% endif -%}
115
116{% include "section-zeromq" %}
117
118{% if network_manager == 'neutron' and network_manager_config -%}
119[neutron]
120url = {{ network_manager_config.neutron_url }}
121{% if network_manager_config.keystone_host -%}
122{% if neutron_plugin and neutron_plugin == 'vsp' -%}
123ovs_bridge = alubr0
124{% endif -%}
125auth_plugin = password
126project_name = {{ network_manager_config.neutron_admin_tenant_name }}
127username = {{ network_manager_config.neutron_admin_username }}
128password = {{ network_manager_config.neutron_admin_password }}
129auth_url = {{ network_manager_config.auth_protocol }}://{{ network_manager_config.keystone_host }}:{{ network_manager_config.auth_port }}
130region = {{ region }}
131{% if metadata_shared_secret -%}
132metadata_proxy_shared_secret = {{ metadata_shared_secret }}
133service_metadata_proxy=True
134{% endif -%}
135{% endif -%}
136{% endif -%}
137
138{% if glance_api_servers -%}
139[glance]
140api_servers = {{ glance_api_servers }}
141{% endif -%}
142
143{% if console_access_protocol == 'spice' -%}
144[spice]
145agent_enabled = True
146enabled = True
147html5proxy_base_url = {{ spice_proxy_address }}
148keymap = {{ console_keymap }}
149server_listen = 0.0.0.0
150server_proxyclient_address = {{ console_listen_addr }}
151{% endif -%}
152
153[libvirt]
154{% if cpu_mode -%}
155cpu_mode = {{ cpu_mode }}
156{% endif -%}
157{% if cpu_model -%}
158cpu_model = {{ cpu_model }}
159{% endif -%}
160{% if libvirt_images_type -%}
161images_type = {{ libvirt_images_type }}
162images_rbd_pool = {{ rbd_pool }}
163images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
164inject_password=false
165inject_key=false
166inject_partition=-2
167{% endif -%}
168{% if rbd_pool -%}
169rbd_pool = {{ rbd_pool }}
170rbd_user = {{ rbd_user }}
171rbd_secret_uuid = {{ rbd_secret_uuid }}
172{% endif -%}
173{% if live_migration_uri -%}
174live_migration_uri = {{ live_migration_uri }}
175{% endif -%}
176{% if disk_cachemodes -%}
177disk_cachemodes = {{ disk_cachemodes }}
178{% endif -%}
179
180{% include "parts/section-database" %}
181
182{% include "section-rabbitmq-oslo" %}
183
184[oslo_concurrency]
185lock_path=/var/lock/nova

Subscribers

People subscribed via source and target branches