openstack/kolla-ansible
Code Issues Proposed changes

Merge "baremetal: Install iptables for Docker if enabled"

Browse Source
This commit is contained in:
Zuul
2020-10-14 09:34:59 +00:00
committed by Gerrit Code Review
parent b0439c67b1 bc1d02d896
commit db4e12e9d3
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/baremetal/defaults/main.yml
View File

@@ -45,6 +45,7 @@ debian_pkg_install:
- "{% if virtualenv is not none %}python3-virtualenv{% endif %}" - "{% if virtualenv is not none %}python3-virtualenv{% endif %}"
- "{% if enable_host_ntp | bool %}ntp{% endif %}" - "{% if enable_host_ntp | bool %}ntp{% endif %}"
- "{% if enable_multipathd|bool %}sg3-utils-udev{% endif %}" - "{% if enable_multipathd|bool %}sg3-utils-udev{% endif %}"
- "{% if not docker_disable_default_iptables_rules | bool %}iptables{% endif %}"
redhat_pkg_install: redhat_pkg_install:
- "{{ docker_yum_package }}" - "{{ docker_yum_package }}"
@@ -53,6 +54,7 @@ redhat_pkg_install:
- "{% if virtualenv is not none %}python3-virtualenv{% endif %}" - "{% if virtualenv is not none %}python3-virtualenv{% endif %}"
- "{% if enable_host_ntp | bool %}ntp{% endif %}" - "{% if enable_host_ntp | bool %}ntp{% endif %}"
- sudo - sudo
- "{% if not docker_disable_default_iptables_rules | bool %}iptables{% endif %}"
ubuntu_pkg_removals: ubuntu_pkg_removals:
- lxd - lxd

6
releasenotes/notes/docker-install-iptables-f24fef8ce2418963.yaml Normal file
View File

@@ -0,0 +1,6 @@
---
fixes:
- |
Fixes an issue where Docker may fail to start if ``iptables`` is not
installed. `LP#1899060
<https://bugs.launchpad.net/kolla-ansible/+bug/1899060>`__