Merge "Allow disabling nova-ssh"

This commit is contained in:
Zuul 2018-07-20 10:58:14 +00:00 committed by Gerrit Code Review
commit 8ce120159c
4 changed files with 9 additions and 1 deletions

View File

@ -493,6 +493,7 @@ enable_neutron_segments: "no"
enable_neutron_sfc: "no"
enable_neutron_infoblox_ipam_agent: "no"
enable_nova_serialconsole_proxy: "no"
enable_nova_ssh: "yes"
enable_octavia: "no"
enable_opendaylight: "no"
enable_openvswitch: "{{ neutron_plugin_agent != 'linuxbridge' | bool }}"

View File

@ -26,7 +26,7 @@ nova_services:
container_name: "nova_ssh"
group: "compute"
image: "{{ nova_ssh_image_full }}"
enabled: True
enabled: "{{ enable_nova_ssh | bool }}"
volumes:
- "{{ node_config_directory }}/nova-ssh/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"

View File

@ -247,6 +247,7 @@ kolla_internal_vip_address: "10.10.10.254"
#enable_neutron_sfc: "no"
#enable_nova_fake: "no"
#enable_nova_serialconsole_proxy: "no"
#enable_nova_ssh: "yes"
#enable_octavia: "no"
#enable_opendaylight: "no"
#enable_openvswitch: "{{ neutron_plugin_agent != 'linuxbridge' }}"

View File

@ -0,0 +1,6 @@
---
features:
- |
Add a configuration option `enable_nova_ssh` to allow disabling the
service. This is useful when an operator is not supporting cold-migration
and does not want to manage additional SSH keys.