openstack/kolla-ansible
Code Issues Proposed changes

Merge "Configure Zun for Placement (Train+)"

Browse Source
This commit is contained in:
Zuul 2019-09-10 17:51:49 +00:00 committed by Gerrit Code Review
commit 15ce0e0600
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/zun/templates/zun.conf.j2
View File

@ -98,6 +98,9 @@ lock_path = /var/lib/zun/tmp
policy_file = {{ zun_policy_file }} policy_file = {{ zun_policy_file }}
{% endif %} {% endif %}
[compute]
host_shared_with_nova = {{ inventory_hostname in groups['compute'] and enable_nova | bool and not enable_nova_fake | bool }}
[websocket_proxy] [websocket_proxy]
wsproxy_host = {{ api_interface_address }} wsproxy_host = {{ api_interface_address }}
wsproxy_port = {{ zun_wsproxy_port }} wsproxy_port = {{ zun_wsproxy_port }}

1
doc/source/reference/compute/zun-guide.rst
View File

@ -20,6 +20,7 @@ following variables:
enable_zun: "yes" enable_zun: "yes"
enable_kuryr: "yes" enable_kuryr: "yes"
enable_etcd: "yes" enable_etcd: "yes"
enable_placement: "yes"
docker_configure_for_zun: "yes" docker_configure_for_zun: "yes"
Docker reconfiguration requires reboostrapping before deploy. Docker reconfiguration requires reboostrapping before deploy.

1
tests/templates/globals-default.j2
View File

@ -67,6 +67,7 @@ enable_cinder_backend_lvm: "yes"
enable_zun: "yes" enable_zun: "yes"
enable_kuryr: "yes" enable_kuryr: "yes"
enable_etcd: "yes" enable_etcd: "yes"
enable_placement: "yes"
docker_configure_for_zun: "yes" docker_configure_for_zun: "yes"
{% endif %} {% endif %}