Make libvirt over tcp an option

If you don't need to expose libvirt over tcp, you have the option
not to.

Change-Id: I582841296f8bc3b02cb1918c209d777ba607b55a
This commit is contained in:
Kevin Fox 2016-08-30 11:12:33 -07:00
parent 244f3c2041
commit 6a3e205be6
3 changed files with 15 additions and 2 deletions

View File

@ -27,6 +27,7 @@ nova_conductor_replicas: "1"
nova_scheduler_replicas: "1"
enable_openvswitch_tcp: "no"
enable_libvirt_tcp: "no"
#################################
# Kubernetes Cluster DNS setting

View File

@ -29,7 +29,10 @@ spec:
crudini --set /nova/nova.conf vnc vncserver_listen $IP;
crudini --set /nova/nova.conf vnc vncserver_proxyclient_address $IP;
crudini --set /nova/nova.conf vnc novncproxy_base_url $IP;
crudini --set /nova/nova.conf vnc connection_uri ''qemu+tcp://''$IP"],
{%- if enable_libvirt_tcp == "yes" %}
crudini --set /nova/nova.conf vnc connection_uri ''qemu+tcp://''$IP;
{%- endif %}
"],
"volumeMounts": [
{
"name": "nova-compute-config",
@ -44,6 +47,9 @@ spec:
]'
spec:
hostNetwork: True
{%- if enable_libvirt_tcp != "yes" %}
hostIPC: True
{%- endif %}
containers:
- name: nova-compute
image: "{{ nova_compute_image_full }}"

View File

@ -24,7 +24,10 @@ spec:
"-c",
"cp -a /config/..data/* /nova/;
ip=$(ip addr show dev {{ tunnel_interface }} | grep -G ''inet '' | awk ''{print $2}'');
sed -i ''s|^listen_addr.*=.*|listen_addr=\"''${ip%/*}''\"|g'' /nova/libvirtd.conf;"],
{%- if enable_libvirt_tcp == "yes" %}
sed -i ''s|^listen_addr.*=.*|listen_addr=\"''${ip%/*}''\"|g'' /nova/libvirtd.conf;
{%- endif %}
"],
"volumeMounts": [
{
"name": "nova-libvirt-config",
@ -40,6 +43,9 @@ spec:
spec:
hostNetwork: True
hostPID: True
{%- if enable_libvirt_tcp != "yes" %}
hostIPC: True
{%- endif %}
containers:
- name: nova-libvirt
image: "{{ nova_libvirt_image_full }}"