diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-10 17:51:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-10 17:51:49 +0000 |
| commit | 15ce0e060004ee0a00338af6734a0b519b8a0af4 (patch) | |
| tree | d39470e15806bf0e1a6cac6faad68109423f6138 | |
| parent | 04975ceaf1d131a3337d3a9275d838e7f670a86c (diff) | |
| parent | 0f5e065855903a7ce68c27f0504388e4ee31b46d (diff) | |
| download | kolla-ansible-15ce0e060004ee0a00338af6734a0b519b8a0af4.tar.gz kolla-ansible-15ce0e060004ee0a00338af6734a0b519b8a0af4.zip | |
Merge "Configure Zun for Placement (Train+)"
| -rw-r--r-- | ansible/roles/zun/templates/zun.conf.j2 | 3 | ||||
| -rw-r--r-- | doc/source/reference/compute/zun-guide.rst | 1 | ||||
| -rw-r--r-- | tests/templates/globals-default.j2 | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/ansible/roles/zun/templates/zun.conf.j2 b/ansible/roles/zun/templates/zun.conf.j2 index 8d179a994..d38b3c90a 100644 --- a/ansible/roles/zun/templates/zun.conf.j2 +++ b/ansible/roles/zun/templates/zun.conf.j2 @@ -98,6 +98,9 @@ lock_path = /var/lib/zun/tmp policy_file = {{ zun_policy_file }} {% endif %} +[compute] +host_shared_with_nova = {{ inventory_hostname in groups['compute'] and enable_nova | bool and not enable_nova_fake | bool }} + [websocket_proxy] wsproxy_host = {{ api_interface_address }} wsproxy_port = {{ zun_wsproxy_port }} diff --git a/doc/source/reference/compute/zun-guide.rst b/doc/source/reference/compute/zun-guide.rst index 17e9b34c9..d0252fa82 100644 --- a/doc/source/reference/compute/zun-guide.rst +++ b/doc/source/reference/compute/zun-guide.rst @@ -20,6 +20,7 @@ following variables: enable_zun: "yes" enable_kuryr: "yes" enable_etcd: "yes" + enable_placement: "yes" docker_configure_for_zun: "yes" Docker reconfiguration requires reboostrapping before deploy. diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index 1de170859..37d86ac5e 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -67,6 +67,7 @@ enable_cinder_backend_lvm: "yes" enable_zun: "yes" enable_kuryr: "yes" enable_etcd: "yes" +enable_placement: "yes" docker_configure_for_zun: "yes" {% endif %} |