Merge lp:~gnuoy/charms/trusty/nova-compute/ice-meta [a=gnuoy] [r=tribaal]

Add local dhcp support for icehouse.
This commit is contained in:
Christopher Glass 2015-09-24 09:54:05 +02:00
commit 0d6ad4872a

View File

@ -39,6 +39,11 @@ my_ip = {{ host_ip }}
glance_api_servers = {{ glance_api_servers }}
{% endif -%}
{% if metadata_shared_secret -%}
neutron_metadata_proxy_shared_secret = {{ metadata_shared_secret }}
service_neutron_metadata_proxy=True
{% endif -%}
{% if console_vnc_type -%}
vnc_enabled = True
novnc_enabled = True