[hopem] Sync charm-helpers and add support for neutron_url in nova.conf
This commit is contained in:
parent
edcc9282e0
commit
b623514061
@ -17,18 +17,3 @@ firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewal
|
|||||||
{% else -%}
|
{% else -%}
|
||||||
firewall_driver = neutron.agent.firewall.NoopFirewallDriver
|
firewall_driver = neutron.agent.firewall.NoopFirewallDriver
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
||||||
[keystone_authtoken]
|
|
||||||
signing_dir = $state_path/keystone-signing
|
|
||||||
{% if service_host -%}
|
|
||||||
service_protocol = {{ service_protocol }}
|
|
||||||
service_host = {{ service_host }}
|
|
||||||
service_port = {{ service_port }}
|
|
||||||
auth_host = {{ auth_host }}
|
|
||||||
auth_port = {{ auth_port }}
|
|
||||||
auth_protocol = {{ auth_protocol }}
|
|
||||||
admin_tenant_name = {{ admin_tenant_name }}
|
|
||||||
admin_user = {{ admin_user }}
|
|
||||||
admin_password = {{ admin_password }}
|
|
||||||
signing_dir = $state_path/keystone-signing
|
|
||||||
{% endif -%}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user