From 2d49a1590b3f399103a650f7e567aeb0b78c1e6a Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 26 Oct 2017 10:44:48 -0500 Subject: [PATCH] change netvars to 0-init --- iiab-base.yml | 2 +- iiab-from-console.yml | 2 +- iiab-network.yml | 2 +- iiab.yml | 2 +- roles/{netvars => 0-init}/defaults/main.yml | 0 roles/{netvars => 0-init}/tasks/main.yml | 0 runtags | 4 ++-- 7 files changed, 6 insertions(+), 6 deletions(-) rename roles/{netvars => 0-init}/defaults/main.yml (100%) rename roles/{netvars => 0-init}/tasks/main.yml (100%) diff --git a/iiab-base.yml b/iiab-base.yml index 23f440d66..a359808d9 100644 --- a/iiab-base.yml +++ b/iiab-base.yml @@ -8,6 +8,6 @@ - vars/local_vars.yml roles: - - { role: netvars, tags: ['netvars'] } + - { role: 0-init, tags: ['init'] } - { role: 1-prep, tags: ['prep','platform','base'] } - { role: openvpn, tags: ['openvpn'] } diff --git a/iiab-from-console.yml b/iiab-from-console.yml index 98641a303..1c29d7b18 100644 --- a/iiab-from-console.yml +++ b/iiab-from-console.yml @@ -9,7 +9,7 @@ - /etc/iiab/config_vars.yml roles: - - { role: netvars, tags: ['netvars'] } + - { role: 0-init, tags: ['init'] } - { role: 4-server-options, tags: ['options'] } - { role: 5-xo-services, tags: ['xo-services'] } - { role: 6-generic-apps, tags: ['generic-apps'] } diff --git a/iiab-network.yml b/iiab-network.yml index e717e7fa5..989108cb3 100644 --- a/iiab-network.yml +++ b/iiab-network.yml @@ -9,5 +9,5 @@ - /etc/iiab/config_vars.yml roles: - - { role: netvars, tags: ['network'] } + - { role: 0-init, tags: ['network'] } - { role: network, tags: ['network','base'] } diff --git a/iiab.yml b/iiab.yml index 5fc0e8e85..b46cac86e 100644 --- a/iiab.yml +++ b/iiab.yml @@ -9,7 +9,7 @@ - /etc/iiab/config_vars.yml roles: - - { role: netvars, tags: ['netvars'] } + - { role: 0-init, tags: ['init'] } - { role: 1-prep, tags: ['prep','platform','base'] } - { role: 2-common, tags: ['common','base'] } - { role: 3-base-server, tags: ['base'] } diff --git a/roles/netvars/defaults/main.yml b/roles/0-init/defaults/main.yml similarity index 100% rename from roles/netvars/defaults/main.yml rename to roles/0-init/defaults/main.yml diff --git a/roles/netvars/tasks/main.yml b/roles/0-init/tasks/main.yml similarity index 100% rename from roles/netvars/tasks/main.yml rename to roles/0-init/tasks/main.yml diff --git a/runtags b/runtags index ffd00a02c..ae25ea4df 100755 --- a/runtags +++ b/runtags @@ -35,7 +35,7 @@ found="N" for tag in $tags do - if [ "$tag" == "netvars" ] + if [ "$tag" == "init" ] then found="Y" fi @@ -47,7 +47,7 @@ taglist=$1 if [ "$found" == "N" ] then - taglist="netvars,"$taglist + taglist="init,"$taglist fi export ANSIBLE_LOG_PATH="$CWD/iiab-debug.log"