aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-08-18 01:49:17 +0000
committerSam Yaple <sam@yaple.net>2015-08-19 03:18:16 +0000
commit8d65921bc31d0ef1ba24bf2cae064f57cae01a9c (patch)
tree5589198285f7db2569855a3624dd99e76055fb07 /tools
parent718db54fa80bbd892670a7a5c1eca5ad991f53eb (diff)
downloadkolla-8d65921bc31d0ef1ba24bf2cae064f57cae01a9c.tar.gz
kolla-8d65921bc31d0ef1ba24bf2cae064f57cae01a9c.zip
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
Diffstat (limited to 'tools')
-rwxr-xr-xtools/kolla-ansible2
1 files changed, 1 insertions, 1 deletions
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