← Back to branch summary

~hopem/charms/trusty/nova-cloud-controller/grizzly

« back to all changes in this revision

Viewing changes to templates/kilo/nova.conf

  • Committer: james.page at ubuntu
  • Date: 2015-03-30 14:27:27 UTC
  • mfrom: (145.1.8 nova-cloud-controller)
  • Revision ID: james.page@ubuntu.com-20150330142727-sh5ivjdmtynpn22x
Add full kilo support

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/kilo/nova.conf
10
10
dhcpbridge=/usr/bin/nova-dhcpbridge
11
11
logdir=/var/log/nova
12
12
state_path=/var/lib/nova
13
 
lock_path=/var/lock/nova
14
13
force_dhcp_release=True
15
14
iscsi_helper=tgtadm
16
15
libvirt_use_virtio_for_bridges=True
46
45
keystone_ec2_url = {{ keystone_ec2_url }}
47
46
{% endif -%}
48
47
 
49
 
{% include "parts/rabbitmq" %}
50
 
 
51
48
{% if rbd_pool -%}
52
49
rbd_pool = {{ rbd_pool }}
53
50
rbd_user = {{ rbd_user }}
131
128
{% endif -%}
132
129
{% endif -%}
133
130
 
134
 
{% if auth_host -%}
135
 
[keystone_authtoken]
136
 
auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/
137
 
auth_host = {{ auth_host }}
138
 
auth_port = {{ auth_port }}
139
 
auth_protocol = {{ auth_protocol }}
140
 
admin_tenant_name = {{ admin_tenant_name }}
141
 
admin_user = {{ admin_user }}
142
 
admin_password = {{ admin_password }}
143
 
signing_dir = {{ signing_dir }}
144
 
{% endif -%}
 
131
{% include "section-keystone-authtoken" %}
145
132
 
146
133
[osapi_v3]
147
134
enabled=True
150
137
 
151
138
[conductor]
152
139
workers = {{ workers }}
 
140
 
 
141
{% include "section-rabbitmq-oslo" %}
 
142
 
 
143
[oslo_concurrency]
 
144
lock_path=/var/lock/nova