From 9f86ecc0996212d9d61ea5f1a4be2f073e5af628 Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Fri, 23 Apr 2021 08:48:46 +0000 Subject: [PATCH] Rename gw01.home.foo.sh to dna-gw01.home.foo.sh --- group_vars/gw.yml | 2 +- host_vars/{gw01.home.foo.sh.yml => dna-gw01.home.foo.sh.yml} | 0 hosts | 2 +- .../templates/{ifstated-home.conf.j2 => ifstated-dna.conf.j2} | 4 ++-- ...onf.gw01.home.foo.sh => unbound.conf.dna-gw01.home.foo.sh} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename host_vars/{gw01.home.foo.sh.yml => dna-gw01.home.foo.sh.yml} (100%) rename roles/ifstated/templates/{ifstated-home.conf.j2 => ifstated-dna.conf.j2} (91%) rename roles/unbound/files/{unbound.conf.gw01.home.foo.sh => unbound.conf.dna-gw01.home.foo.sh} (100%) diff --git a/group_vars/gw.yml b/group_vars/gw.yml index 7d245bb..9b2bacc 100644 --- a/group_vars/gw.yml +++ b/group_vars/gw.yml @@ -20,4 +20,4 @@ network_ether_interfaces: firewall_src: pf.conf.gw_home # ifstated config -ifstated_config: ifstated-home.conf.j2 +ifstated_config: ifstated-dna.conf.j2 diff --git a/host_vars/gw01.home.foo.sh.yml b/host_vars/dna-gw01.home.foo.sh.yml similarity index 100% rename from host_vars/gw01.home.foo.sh.yml rename to host_vars/dna-gw01.home.foo.sh.yml diff --git a/hosts b/hosts index 685125b..ffeed25 100644 --- a/hosts +++ b/hosts @@ -12,7 +12,7 @@ fsol-gw02.home.foo.sh git02.home.foo.sh [gw] -gw01.home.foo.sh +dna-gw01.home.foo.sh dna-gw02.home.foo.sh [jenkins] diff --git a/roles/ifstated/templates/ifstated-home.conf.j2 b/roles/ifstated/templates/ifstated-dna.conf.j2 similarity index 91% rename from roles/ifstated/templates/ifstated-home.conf.j2 rename to roles/ifstated/templates/ifstated-dna.conf.j2 index 33a78e6..3345053 100644 --- a/roles/ifstated/templates/ifstated-home.conf.j2 +++ b/roles/ifstated/templates/ifstated-dna.conf.j2 @@ -37,9 +37,9 @@ state backup { run "/sbin/ifconfig vio1 delete lladdr {{ gw_home_mac }} down" # flush routes and fix default route run "/sbin/route -qn flush" -{% if inventory_hostname == "gw01.home.foo.sh" %} +{% if inventory_hostname == "dna-gw01.home.foo.sh" %} run "/sbin/route -qn add default 172.20.21.2" -{% elif inventory_hostname == "gw02.home.foo.sh" %} +{% elif inventory_hostname == "dna-gw02.home.foo.sh" %} run "/sbin/route -qn add default 172.20.21.1" {% endif %} } diff --git a/roles/unbound/files/unbound.conf.gw01.home.foo.sh b/roles/unbound/files/unbound.conf.dna-gw01.home.foo.sh similarity index 100% rename from roles/unbound/files/unbound.conf.gw01.home.foo.sh rename to roles/unbound/files/unbound.conf.dna-gw01.home.foo.sh