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

Proposed by James Page on 2016-02-11
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 2016-02-11 Approve on 2016-02-12
Review via email: mp+285780@code.launchpad.net
To post a comment you must log in.

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/

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) 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

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/

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 on 2016-02-12

Fixup template header

196. By James Page on 2016-02-12

Disable mitaka tests until all merges land

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/

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/

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) wrote :

LGTM, Merging

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches