From acda312aba6434ef25ca7bb092af10f7106f9d39 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Thu, 29 Oct 2020 08:43:26 +0100
Subject: [PATCH] Explicitly open ports 68 and 69 on Ubuntu

Change-Id: I4250d3086b2971d6936b73d174921bf808c87770
---
 playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml | 2 ++
 releasenotes/notes/ubuntu-ports-ce9d1ceaf516adce.yaml      | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100644 releasenotes/notes/ubuntu-ports-ce9d1ceaf516adce.yaml

diff --git a/playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml b/playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml
index 9582853aa..db98889ac 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml
@@ -343,6 +343,8 @@
     in_interface: "{{ network_interface }}"
     jump: ACCEPT
   loop:
+    - 68
+    - 69
     - "{{ file_url_port }}"
     - 6385
   when: not use_firewalld | bool
diff --git a/releasenotes/notes/ubuntu-ports-ce9d1ceaf516adce.yaml b/releasenotes/notes/ubuntu-ports-ce9d1ceaf516adce.yaml
new file mode 100644
index 000000000..e779c1505
--- /dev/null
+++ b/releasenotes/notes/ubuntu-ports-ce9d1ceaf516adce.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Explicitly opens ports 68 and 69 in firewall on systems not using
+    firewalld (e.g. Ubuntu).