openstack/kolla-ansible
Code Issues Proposed changes

kolla-ansible: refactor the command options

Browse Source 
TrivialFix

Change-Id: I511f463250d1472c831aa3e5b126dafb36ce79c4
This commit is contained in:
Allen Gao 2016-01-20 22:12:42 +08:00 committed by Allen Gao
parent 2504f55038
commit 980bbcb414
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/kolla-ansible
View File

@ -79,29 +79,29 @@ while [ "$#" -gt 0 ]; do
esac esac
done done
EXTRA_OPTS="-e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml"
case "$1" in case "$1" in
(prechecks) (prechecks)
ACTION="Pre-deployment checking" ACTION="Pre-deployment checking"
PLAYBOOK="${BASEDIR}/ansible/prechecks.yml" PLAYBOOK="${BASEDIR}/ansible/prechecks.yml"
CMD="ansible-playbook -i $INVENTORY -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml $PLAYBOOK"
;; ;;
(deploy) (deploy)
ACTION="Deploying Playbooks" ACTION="Deploying Playbooks"
CMD="ansible-playbook -i $INVENTORY -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml $PLAYBOOK -e action=deploy" EXTRA_OPTS="$EXTRA_OPTS -e action=deploy"
;; ;;
(post-deploy) (post-deploy)
ACTION="Post-Deploying Playbooks" ACTION="Post-Deploying Playbooks"
PLAYBOOK="${BASEDIR}/ansible/post-deploy.yml" PLAYBOOK="${BASEDIR}/ansible/post-deploy.yml"
CMD="ansible-playbook -i $INVENTORY -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml $PLAYBOOK"
;; ;;
(pull) (pull)
ACTION="Pulling Docker images" ACTION="Pulling Docker images"
CMD="ansible-playbook -i $INVENTORY -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml $PLAYBOOK -e action=pull" EXTRA_OPTS="$EXTRA_OPTS -e action=pull"
;; ;;
(upgrade) (upgrade)
ACTION="Upgrading OpenStack Environment" ACTION="Upgrading OpenStack Environment"
CMD="ansible-playbook -i $INVENTORY -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml $PLAYBOOK -e action=upgrade" EXTRA_OPTS="$EXTRA_OPTS -e action=upgrade"
;; ;;
(*) usage (*) usage
@ -109,4 +109,5 @@ case "$1" in
;; ;;
esac esac
CMD="ansible-playbook -i $INVENTORY $EXTRA_OPTS $PLAYBOOK"
process_cmd process_cmd