From 1ae26fac8c2a8839c2f16c618d0ad2423afcf0bc Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Wed, 8 Mar 2017 15:04:48 +0800
Subject: [PATCH] Disable running playbooks in serial by default

Run playbooks in serial are unnecessary and may cause some issue. This
patch disables serial.

This patch also removes the serial for MariaDB playbook. MariaDB handle
this internally.

Partial-Bug: #1668185
Change-Id: I3b4216dd82607475e9bd9b44590b631be4abdbdd
---
 ansible/site.yml                                           | 1 -
 .../notes/disable-serial-in-default-442093aca22658f4.yaml  | 5 +++++
 tools/kolla-ansible                                        | 7 +++++--
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/disable-serial-in-default-442093aca22658f4.yaml

diff --git a/ansible/site.yml b/ansible/site.yml
index be596a7e83..e18a11f8a7 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -123,7 +123,6 @@
 
 - name: Apply role mariadb
   hosts: mariadb
-  serial: '{{ serial|default("0") }}'
   roles:
     - { role: mariadb,
         tags: mariadb,
diff --git a/releasenotes/notes/disable-serial-in-default-442093aca22658f4.yaml b/releasenotes/notes/disable-serial-in-default-442093aca22658f4.yaml
new file mode 100644
index 0000000000..cbb2438ea0
--- /dev/null
+++ b/releasenotes/notes/disable-serial-in-default-442093aca22658f4.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - Run ansible playbooks in serial is disabled by default now. Serial is not
+    recommended. But you can enable it by configuring ANSIBLE_SERIAL
+    environment variable.
diff --git a/tools/kolla-ansible b/tools/kolla-ansible
index e51240fbfb..bddd17d6ff 100755
--- a/tools/kolla-ansible
+++ b/tools/kolla-ansible
@@ -78,6 +78,9 @@ CONFIG_DIR="/etc/kolla"
 PASSWORDS_FILE="${CONFIG_DIR}/passwords.yml"
 DANGER_CONFIRM=
 INCLUDE_IMAGES=
+# Serial is not recommended and disable in default. User could enable it by
+# simple configure ANSIBLE_SERIAL variable
+ANSIBLE_SERIAL=${ANSIBLE_SERIAL:-0}
 
 while [ "$#" -gt 0 ]; do
     case "$1" in
@@ -205,11 +208,11 @@ EOF
         ;;
 (upgrade)
         ACTION="Upgrading OpenStack Environment"
-        EXTRA_OPTS="$EXTRA_OPTS -e action=upgrade -e serial=30%"
+        EXTRA_OPTS="$EXTRA_OPTS -e action=upgrade -e serial=${ANSIBLE_SERIAL}"
         ;;
 (reconfigure)
         ACTION="Reconfigure OpenStack service"
-        EXTRA_OPTS="$EXTRA_OPTS -e action=reconfigure -e serial=30%"
+        EXTRA_OPTS="$EXTRA_OPTS -e action=reconfigure -e serial=${ANSIBLE_SERIAL}"
         ;;
 (stop)
         ACTION="Stop Kolla containers"