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
1
# kilo
7
2
###############################################################################
8
3
# [ WARNING ]
9
4
# Configuration file maintained by Juju. Local changes may be overwritten.
10
5
{% if restart_trigger -%}
11
6
# restart trigger: {{ restart_trigger }}
12
7
{% endif -%}
13
8
###############################################################################
14
9
[DEFAULT]
15
10
dhcpbridge_flagfile=/etc/nova/nova.conf
16
11
dhcpbridge=/usr/bin/nova-dhcpbridge
17
12
logdir=/var/log/nova
18
13
state_path=/var/lib/nova
19
14
lock_path=/var/lock/nova
20
15
force_dhcp_release=True
21
16
verbose=True
22
17
use_syslog = {{ use_syslog }}
23
18
ec2_private_dns_show_ip=True
24
19
api_paste_config=/etc/nova/api-paste.ini
25
20
enabled_apis=ec2,osapi_compute,metadata
26
21
auth_strategy=keystone
27
22
compute_driver=libvirt.LibvirtDriver
28
23
my_ip = {{ host_ip }}
29
24
30
25
{% include "parts/database" %}
31
26
32
27
{% include "parts/rabbitmq" %}
33
28
34
29
{% if console_vnc_type -%}
35
30
vnc_enabled = True
36
31
novnc_enabled = True
37
32
vnc_keymap = {{ console_keymap }}
38
33
vncserver_listen = 0.0.0.0
39
34
vncserver_proxyclient_address = {{ console_listen_addr }}
40
35
{% if console_access_protocol == 'novnc' or console_access_protocol == 'vnc' -%}
41
36
novncproxy_base_url = {{ novnc_proxy_address }}
42
37
{% endif -%}
43
38
{% if console_access_protocol == 'xvpvnc' or console_access_protocol == 'vnc' -%}
44
39
xvpvncproxy_port = {{ xvpvnc_proxy_port }}
45
40
xvpvncproxy_host = {{ xvpvnc_proxy_host }}
46
41
xvpvncproxy_base_url = {{ xvpvnc_proxy_address }}
47
42
{% endif -%}
48
43
{% else -%}
49
44
vnc_enabled = False
50
45
novnc_enabled = False
51
46
{% endif -%}
52
47
53
48
{% if neutron_plugin and neutron_plugin == 'ovs' -%}
54
49
libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver
55
50
{% if neutron_security_groups -%}
56
51
security_group_api = neutron
57
52
firewall_driver = nova.virt.firewall.NoopFirewallDriver
58
53
{% endif -%}
59
54
{% endif -%}
60
55
61
56
{% if neutron_plugin and (neutron_plugin == 'nvp' or neutron_plugin == 'nsx') -%}
62
57
libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtOpenVswitchVirtualPortDriver
63
58
security_group_api = neutron
64
59
firewall_driver = nova.virt.firewall.NoopFirewallDriver
65
60
{% endif -%}
66
61
67
62
{% if network_manager != 'neutron' and network_manager_config -%}
68
63
{% for key, value in network_manager_config.iteritems() -%}
69
64
{{ key }} = {{ value }}
70
65
{% endfor -%}
71
66
{% endif -%}
72
67
73
68
{% if network_manager == 'neutron' -%}
74
69
network_api_class = nova.network.neutronv2.api.API
75
70
{% else -%}
76
71
network_manager = nova.network.manager.FlatDHCPManager
77
72
{% endif -%}
78
73
79
74
{% if volume_service -%}
80
75
volume_api_class = nova.volume.cinder.API
81
76
{% endif -%}
82
77
83
78
{% if user_config_flags -%}
84
79
{% for key, value in user_config_flags.iteritems() -%}
85
80
{{ key }} = {{ value }}
86
81
{% endfor -%}
87
82
{% endif -%}
88
83
89
84
{% if instances_path -%}
90
85
instances_path = {{ instances_path }}
91
86
{% endif -%}
92
87
93
88
{% if sections and 'DEFAULT' in sections -%}
94
89
{% for key, value in sections['DEFAULT'] -%}
95
90
{{ key }} = {{ value }}
96
91
{% endfor -%}
97
92
{% endif -%}
98
93
99
94
{% if network_manager == 'neutron' and network_manager_config -%}
100
95
[neutron]
101
96
url = {{ network_manager_config.neutron_url }}
102
97
{% if network_manager_config.keystone_host -%}
103
98
auth_strategy = keystone
104
99
admin_tenant_name = {{ network_manager_config.neutron_admin_tenant_name }}
105
100
admin_username = {{ network_manager_config.neutron_admin_username }}
106
101
admin_password = {{ network_manager_config.neutron_admin_password }}
107
102
admin_auth_url = {{ network_manager_config.auth_protocol }}://{{ network_manager_config.keystone_host }}:{{ network_manager_config.auth_port }}/v2.0
108
103
{% endif -%}
109
104
{% endif -%}
110
105
111
106
{% if glance_api_servers -%}
112
107
[glance]
113
108
api_servers = {{ glance_api_servers }}
114
109
{% endif -%}
115
110
116
111
{% if console_access_protocol == 'spice' -%}
117
112
[spice]
118
113
agent_enabled = True
119
114
enabled = True
120
115
html5proxy_base_url = {{ spice_proxy_address }}
121
116
keymap = {{ console_keymap }}
122
117
server_listen = 0.0.0.0
123
118
server_proxyclient_address = {{ console_listen_addr }}
124
119
{% endif -%}
125
120
126
121
[libvirt]
127
122
{% if libvirt_images_type -%}
128
123
images_type = {{ libvirt_images_type }}
129
124
images_rbd_pool = {{ rbd_pool }}
130
125
images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
131
126
inject_password=false
132
127
inject_key=false
133
128
inject_partition=-2
134
129
{% endif -%}
135
130
{% if rbd_pool -%}
136
131
rbd_pool = {{ rbd_pool }}
137
132
rbd_user = {{ rbd_user }}
138
133
rbd_secret_uuid = {{ rbd_secret_uuid }}
139
134
{% endif -%}
140
135
{% if live_migration_uri -%}
141
136
live_migration_uri = {{ live_migration_uri }}
142
137
{% endif -%}
143
138
{% if disk_cachemodes -%}
144
139
disk_cachemodes = {{ disk_cachemodes }}
145
140
{% endif -%}
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Liam Young (community)		2015-01-21	Approve on 2015-01-21
Review via email: mp+247108@code.launchpad.net