From 8d65921bc31d0ef1ba24bf2cae064f57cae01a9c Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Tue, 18 Aug 2015 01:49:17 +0000
Subject: Move defaults.yml to group_vars/all.yml

The purpose for having defaults.yml on the command line was originally
for variable inheritance. Over the past month we have slowly changed
how things are inherited (like ports) allowing us to place these
'defaults' into the group_vars/all.yml location as they should be
values that go unchanged (but can be overridden).

Change-Id: I2becec66bf431bfc9d88fc825b5380c1e173ca70
Partially-Implements: blueprint update-configs
---
 tools/kolla-ansible | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/kolla-ansible b/tools/kolla-ansible
index 43341788d..abfe433fb 100755
--- a/tools/kolla-ansible
+++ b/tools/kolla-ansible
@@ -70,7 +70,7 @@ case "$1" in
 
 (deploy)
         ACTION="Deploying Playbook"
-        CMD="ansible-playbook -i $INVENTORY -e @/etc/kolla/defaults.yml -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml $PLAYBOOK"
+        CMD="ansible-playbook -i $INVENTORY -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml $PLAYBOOK"
         ;;
 
 (*)     usage
-- 
cgit v1.2.3