fixes to simfabric, put apt-cacher first
diff --git a/cord-single-playbook.yml b/cord-single-playbook.yml
index f92f073..b32f61f 100644
--- a/cord-single-playbook.yml
+++ b/cord-single-playbook.yml
@@ -11,6 +11,12 @@
- include_vars: vars/cord.yml
- include_vars: vars/cord_keystone.yml
+- name: Apt-Cache Setup
+ hosts: head
+ become: yes
+ roles:
+ - apt-cacher-ng
+
- name: Prep systems
hosts: all
become: yes
@@ -18,11 +24,10 @@
- common-prep
- cloudlab-prep
-- name: Cache and DNS Server Setup
+- name: DNS Server Setup
hosts: head
become: yes
roles:
- - apt-cacher-ng
- dns-nsd
- dns-unbound
diff --git a/roles/simulate-fabric/files/simulate-fabric-playbook.yml b/roles/simulate-fabric/files/simulate-fabric-playbook.yml
index 6a99712..e97b541 100644
--- a/roles/simulate-fabric/files/simulate-fabric-playbook.yml
+++ b/roles/simulate-fabric/files/simulate-fabric-playbook.yml
@@ -29,8 +29,8 @@
- addresses
- name: Start bridges
- when: "ansible_{{ item.name }}.active is false"
- command: "ip link set dev {{ item }} up"
+ when: "not ansible_{{ item.name }}.active"
+ command: "ip link set dev {{ item.name }} up"
with_items: "{{ simfabric_bridges }}"
- name: Create ip links
@@ -39,19 +39,19 @@
with_items: "{{ simfabric_links }}"
- name: Start interfaces
- when: "ansible_{{ item.name }}.active is false"
+ when: "not ansible_{{ item }}.active"
command: "ip link set dev {{ item }} up"
with_items: "{{ simfabric_interfaces }}"
- name: Add interfaces to bridges
- when: "ansible_{{ item.0.name }}.interfaces is empty"
+ when: "ansible_{{ item.0.name }}.interfaces is not defined"
command: "brctl addif {{ item.0.name }} {{ item.1 }}"
with_subelements:
- "{{ simfabric_bridges }}"
- interfaces
- name: Configure iptables
- iptables: "table={{ item.table }} chain={{ item.chain }} source={{ item.source }} dest={{ item.dest }} jump={{ item.jump }}"
+ iptables: "table={{ item.table }} chain={{ item.chain }} source={{ item.source }} destination={{ item.dest }} jump={{ item.jump }}"
with_items: "{{ simfabric_iptables }}"
- name: Set kernel sysctl values