Remove Docker Swarm bits
Docker Swarm was effectively deprecated in [1], so it can be safely removed now. [1] https://review.opendev.org/c/openstack/openstack-ansible-os_zun/+/936400 Change-Id: I739300a5b4bdcac0a6eef0df5a6f38f16fb45b67 Signed-off-by: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
This commit is contained in:
@@ -395,18 +395,12 @@ zun_kuryr_init_defaults:
|
||||
Group: "{{ zun_kuryr_system_group_name }}"
|
||||
User: "{{ zun_kuryr_system_user_name }}"
|
||||
|
||||
# Key-value storage for docker swarm standalone mode.
|
||||
# Possible options: zk, etcd, consul and null to disable swarm mode
|
||||
zun_docker_kv_storage: null
|
||||
zun_docker_kv_port: 2379
|
||||
zun_docker_kv_group: zun_api
|
||||
|
||||
## Default zun+docker options used within the systemd unit file.
|
||||
zun_docker_init_defaults:
|
||||
Service:
|
||||
ExecStart:
|
||||
- ""
|
||||
- "/usr/bin/dockerd --group {{ zun_system_group_name }} -H tcp://{{ zun_docker_bind_host }}:{{ zun_docker_bind_port }} -H unix:///var/run/docker.sock {% if zun_docker_kv_storage %}--cluster-store {{ zun_docker_kv_storage }}://{% for item in groups[zun_docker_kv_group] %}{{ hostvars[item]['management_address'] }}:{{ zun_docker_kv_port }}{% if not loop.last %},{% endif %}{% endfor %}{% endif %}{% if zun_kata_enabled %} --add-runtime kata=/opt/kata/bin/kata-runtime{% endif %}" # noqa: yaml[line-length]
|
||||
- "/usr/bin/dockerd --group {{ zun_system_group_name }} -H tcp://{{ zun_docker_bind_host }}:{{ zun_docker_bind_port }} -H unix:///var/run/docker.sock{% if zun_kata_enabled %} --add-runtime kata=/opt/kata/bin/kata-runtime{% endif %}" # noqa: yaml[line-length]
|
||||
|
||||
## Tunable overrides for service unit files.
|
||||
zun_api_paste_ini_overrides: {}
|
||||
|
@@ -0,0 +1,9 @@
|
||||
---
|
||||
|
||||
deprecations:
|
||||
- |
|
||||
Variables ``zun_docker_kv_storage``, ``zun_docker_kv_port`` and
|
||||
``zun_docker_kv_group`` were removed and have no effect anymore.
|
||||
- |
|
||||
Docker Swarm mode for Zun is no longer supported and only local
|
||||
deployment for Docker is possible.
|
@@ -10,11 +10,6 @@ bindir = {{ zun_bin | dirname }}/libexec/kuryr
|
||||
# Kuryr URL for accessing Kuryr through json rpc. (string value)
|
||||
kuryr_uri = http://{{ zun_kuryr_service_address }}:{{ zun_kuryr_service_port }}
|
||||
|
||||
{% if zun_docker_kv_storage %}
|
||||
# Kuryr plugin scope reported to libnetwork. (string value)
|
||||
capability_scope = global
|
||||
{% endif %}
|
||||
|
||||
# Do processing external connectivity (boolean value)
|
||||
process_external_connectivity = false
|
||||
|
||||
|
Reference in New Issue
Block a user