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

Proposed by James Page on 2015-01-21
Status: Merged
Merged at revision: 98
Proposed branch: lp:~james-page/charms/trusty/nova-compute/kilo-support
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 145 lines (+140/-0)
1 file modified
templates/kilo/nova.conf (+140/-0)
To merge this branch: bzr merge lp:~james-page/charms/trusty/nova-compute/kilo-support
Reviewer Review Type Date Requested Status
Liam Young 2015-01-21 Approve on 2015-01-21
Review via email: mp+247108@code.launchpad.net
To post a comment you must log in.

charm_lint_check #927 nova-compute-next for james-page mp247108
    LINT OK: passed

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

charm_unit_test #956 nova-compute-next for james-page mp247108
    UNIT OK: passed

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

charm_amulet_test #1149 nova-compute-next for james-page mp247108
    AMULET OK: passed

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

105. By James Page on 2015-01-21

Restore user config flags for kilo

charm_lint_check #934 nova-compute-next for james-page mp247108
    LINT OK: passed

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

charm_unit_test #963 nova-compute-next for james-page mp247108
    UNIT OK: passed

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

Ryan Beisner (1chb1n) wrote :

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

charm_amulet_test #1156 nova-compute-next for james-page mp247108
    AMULET OK: passed

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

Liam Young (gnuoy) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'templates/kilo'
2=== added file 'templates/kilo/nova.conf'
3--- templates/kilo/nova.conf 1970-01-01 00:00:00 +0000
4+++ templates/kilo/nova.conf 2015-01-21 12:27:49 +0000
5@@ -0,0 +1,140 @@
6+# kilo
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+dhcpbridge_flagfile=/etc/nova/nova.conf
16+dhcpbridge=/usr/bin/nova-dhcpbridge
17+logdir=/var/log/nova
18+state_path=/var/lib/nova
19+lock_path=/var/lock/nova
20+force_dhcp_release=True
21+verbose=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+compute_driver=libvirt.LibvirtDriver
28+my_ip = {{ host_ip }}
29+
30+{% include "parts/database" %}
31+
32+{% include "parts/rabbitmq" %}
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 == 'ovs' -%}
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 == 'nvp' or neutron_plugin == 'nsx') -%}
62+libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtOpenVswitchVirtualPortDriver
63+security_group_api = neutron
64+firewall_driver = nova.virt.firewall.NoopFirewallDriver
65+{% endif -%}
66+
67+{% if network_manager != 'neutron' and network_manager_config -%}
68+{% for key, value in network_manager_config.iteritems() -%}
69+{{ key }} = {{ value }}
70+{% endfor -%}
71+{% endif -%}
72+
73+{% if network_manager == 'neutron' -%}
74+network_api_class = nova.network.neutronv2.api.API
75+{% else -%}
76+network_manager = nova.network.manager.FlatDHCPManager
77+{% endif -%}
78+
79+{% if volume_service -%}
80+volume_api_class = nova.volume.cinder.API
81+{% endif -%}
82+
83+{% if user_config_flags -%}
84+{% for key, value in user_config_flags.iteritems() -%}
85+{{ key }} = {{ value }}
86+{% endfor -%}
87+{% endif -%}
88+
89+{% if instances_path -%}
90+instances_path = {{ instances_path }}
91+{% endif -%}
92+
93+{% if sections and 'DEFAULT' in sections -%}
94+{% for key, value in sections['DEFAULT'] -%}
95+{{ key }} = {{ value }}
96+{% endfor -%}
97+{% endif -%}
98+
99+{% if network_manager == 'neutron' and network_manager_config -%}
100+[neutron]
101+url = {{ network_manager_config.neutron_url }}
102+{% if network_manager_config.keystone_host -%}
103+auth_strategy = keystone
104+admin_tenant_name = {{ network_manager_config.neutron_admin_tenant_name }}
105+admin_username = {{ network_manager_config.neutron_admin_username }}
106+admin_password = {{ network_manager_config.neutron_admin_password }}
107+admin_auth_url = {{ network_manager_config.auth_protocol }}://{{ network_manager_config.keystone_host }}:{{ network_manager_config.auth_port }}/v2.0
108+{% endif -%}
109+{% endif -%}
110+
111+{% if glance_api_servers -%}
112+[glance]
113+api_servers = {{ glance_api_servers }}
114+{% endif -%}
115+
116+{% if console_access_protocol == 'spice' -%}
117+[spice]
118+agent_enabled = True
119+enabled = True
120+html5proxy_base_url = {{ spice_proxy_address }}
121+keymap = {{ console_keymap }}
122+server_listen = 0.0.0.0
123+server_proxyclient_address = {{ console_listen_addr }}
124+{% endif -%}
125+
126+[libvirt]
127+{% if libvirt_images_type -%}
128+images_type = {{ libvirt_images_type }}
129+images_rbd_pool = {{ rbd_pool }}
130+images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
131+inject_password=false
132+inject_key=false
133+inject_partition=-2
134+{% endif -%}
135+{% if rbd_pool -%}
136+rbd_pool = {{ rbd_pool }}
137+rbd_user = {{ rbd_user }}
138+rbd_secret_uuid = {{ rbd_secret_uuid }}
139+{% endif -%}
140+{% if live_migration_uri -%}
141+live_migration_uri = {{ live_migration_uri }}
142+{% endif -%}
143+{% if disk_cachemodes -%}
144+disk_cachemodes = {{ disk_cachemodes }}
145+{% endif -%}

Subscribers

People subscribed via source and target branches