Skip to content
Snippets Groups Projects
Commit 6f5f6833 authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

Merge "Merge glance sections for nova.conf.j2"

parents ffd200f5 6b61cbe6
No related branches found
No related tags found
No related merge requests found
...@@ -98,6 +98,7 @@ endpoint_override = {{ ironic_internal_endpoint }}/v1 ...@@ -98,6 +98,7 @@ endpoint_override = {{ ironic_internal_endpoint }}/v1
lock_path = /var/lib/nova/tmp lock_path = /var/lib/nova/tmp
[glance] [glance]
debug = {{ nova_logging_debug }}
api_servers = {{ glance_internal_endpoint }} api_servers = {{ glance_internal_endpoint }}
cafile = {{ openstack_cacert }} cafile = {{ openstack_cacert }}
num_retries = 3 num_retries = 3
...@@ -197,10 +198,6 @@ policy_file = {{ nova_policy_file }} ...@@ -197,10 +198,6 @@ policy_file = {{ nova_policy_file }}
[privsep_entrypoint] [privsep_entrypoint]
helper_command=sudo nova-rootwrap /etc/nova/rootwrap.conf privsep-helper --config-file /etc/nova/nova.conf helper_command=sudo nova-rootwrap /etc/nova/rootwrap.conf privsep-helper --config-file /etc/nova/nova.conf
[glance]
debug = {{ nova_logging_debug }}
cafile = {{ openstack_cacert }}
[guestfs] [guestfs]
debug = {{ nova_logging_debug }} debug = {{ nova_logging_debug }}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment