commit e681cbc0054cf26dee1cea2120dc21e5ac7e6992
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Oct 21 18:14:34 2018 +0200
Fixup nmcli and iptables-restore
inventory/host_vars/buildvm-07.virt.rpmfusion.net | 9 +++++++++
roles/base/tasks/main.yml | 4 ++--
2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git
a/inventory/host_vars/buildvm-07.virt.rpmfusion.net
b/inventory/host_vars/buildvm-07.virt.rpmfusion.net
new file mode 100644
index 0000000..6720b95
--- /dev/null
+++
b/inventory/host_vars/buildvm-07.virt.rpmfusion.net
@@ -0,0 +1,9 @@
+---
+datacenter: virt
+
+#
+# We need to mount koji storage rw here so run_root can work.
+# The rest of the group can be ro, it's only builders in the
+# compose channel that need a rw mount
+
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index a44f9b7..f3b63c4 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -62,7 +62,7 @@
- ifcfg
- name: get interface uuid
- shell: nmcli -f "DEVICE,UUID" c show --active | grep -E '^eth|^br'
+ shell: nmcli -f "DEVICE,UUID" c show --active | grep -E
'^eth|^br|^en'
register: if_uuid
changed_when: false
failed_when: 'if_uuid.stdout == ""'
@@ -189,7 +189,7 @@
- base
- name: iptables
- template: src={{ item }} dest=/etc/sysconfig/iptables mode=0600
validate="/sbin/iptables-restore --text %s"
+ template: src={{ item }} dest=/etc/sysconfig/iptables mode=0600
validate="/sbin/iptables-restore %s"
with_first_found:
- iptables/iptables.{{ datacenter }}
- iptables/iptables.{{ inventory_hostname }}