From 507bfa19385d0cd8147f5bbc8b3c1bdf0c31843c Mon Sep 17 00:00:00 2001 From: George Hunt Date: Mon, 2 Oct 2017 09:37:58 -0700 Subject: [PATCH] test revert --- iiab.yml | 1 + roles/9-local-addons/tasks/main.yml | 2 -- runansible | 10 +++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/iiab.yml b/iiab.yml index 8a2df7715..6be4ebaac 100644 --- a/iiab.yml +++ b/iiab.yml @@ -6,6 +6,7 @@ - vars/default_vars.yml - vars/{{ ansible_local.local_facts.os_ver}}.yml - vars/local_vars.yml + - /etc/iiab/config_vars.yml roles: - { role: 1-prep, tags: ['prep','platform','base'] } diff --git a/roles/9-local-addons/tasks/main.yml b/roles/9-local-addons/tasks/main.yml index 62d761ab3..ce546dfe9 100644 --- a/roles/9-local-addons/tasks/main.yml +++ b/roles/9-local-addons/tasks/main.yml @@ -1,5 +1,3 @@ - name: Addon services installed command: echo Addon services installed -- name: Installation Complete - shell: echo "{}" > /etc/iiab/config_vars.yml diff --git a/runansible b/runansible index 74c7013d0..500bc9c10 100755 --- a/runansible +++ b/runansible @@ -1,6 +1,11 @@ -#!/bin/bash -e -# ./scripts/ansible +#!/bin/bash + # copy var files to /etc/iiab for subsequent use +mkdir -p /etc/iiab +if [ ! -f /etc/iiab/config_vars.yml ]; then + echo "{}" > /etc/iiab/config_vars.yml +fi + # if vars/local_vars.yml is missing, put a default one in place if [ ! -f ./vars/local_vars.yml ]; then OS=`grep ^ID= /etc/*release|cut -d= -f2` @@ -73,4 +78,3 @@ export ANSIBLE_LOG_PATH="$XSCE_DIR/iiab-install.log" ansible -m setup -i $INVENTORY localhost --connection=local >> /dev/null ansible-playbook -i $INVENTORY $PLAYBOOK ${ARGS} --connection=local -#ansible-playbook -i $INVENTORY $PLAYBOOK ${ARGS} --syntax-check