openstack
/
kolla-ansible
Code Issues Proposed changes

[train] Finish configuring Zun to use Placement 

This also enables Placement when Zun is enabled like Kolla Ansible
already does with Nova.

Change-Id: Id2a09f702e8503b49d2b9e73e06b2ce9f4d168a9
Closes-bug: #1840573
This commit is contained in:
Radosław Piliszek 2019-10-20 19:33:56 +02:00
parent 4d398f4b7f
commit 099a33c87d
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/all.yml
View File

@ -653,7 +653,7 @@ enable_openvswitch: "{{ enable_neutron | bool and neutron_plugin_agent != 'linux
enable_ovs_dpdk: "no"
enable_osprofiler: "no"
enable_panko: "no"
enable_placement: "{{ enable_nova | bool }}"
enable_placement: "{{ enable_nova | bool or enable_zun | bool }}"
enable_prometheus: "no"
enable_qdrouterd: "{{ 'yes' if om_rpc_transport == 'amqp' else 'no' }}"
enable_qinling: "no"

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

@ -82,6 +82,10 @@ endpoint_type = internalURL
region_name = {{ openstack_region_name }}
endpoint_type = internalURL
[placement_client]
region_name = {{ openstack_region_name }}
endpoint_type = internalURL
{% if enable_osprofiler | bool %}
[profiler]
enabled = true

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

@ -20,7 +20,6 @@ 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.

2
etc/kolla/globals.yml
View File

@ -324,7 +324,7 @@
#enable_ovs_dpdk: "no"
#enable_osprofiler: "no"
#enable_panko: "no"
#enable_placement: "{{ enable_nova | bool }}"
#enable_placement: "{{ enable_nova | bool or enable_zun | bool }}"
#enable_prometheus: "no"
#enable_qdrouterd: "{{ 'yes' if om_rpc_transport == 'amqp' else 'no' }}"
#enable_qinling: "no"

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

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