diff --git a/ansible/roles/aodh/tasks/reconfigure.yml b/ansible/roles/aodh/tasks/reconfigure.yml
index 72e421b794..fa2921b205 100644
--- a/ansible/roles/aodh/tasks/reconfigure.yml
+++ b/ansible/roles/aodh/tasks/reconfigure.yml
@@ -1,7 +1,6 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['aodh-api']
         or inventory_hostname in groups['aodh-listener']
         or inventory_hostname in groups['aodh-evaluator']
-        or inventory_hostname in groups['aodh-notifier']
\ No newline at end of file
+        or inventory_hostname in groups['aodh-notifier']
diff --git a/ansible/roles/ceilometer/tasks/reconfigure.yml b/ansible/roles/ceilometer/tasks/reconfigure.yml
index 712aa4e4ec..7ae9d9d8ce 100644
--- a/ansible/roles/ceilometer/tasks/reconfigure.yml
+++ b/ansible/roles/ceilometer/tasks/reconfigure.yml
@@ -1,6 +1,5 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['ceilometer-api']
         or inventory_hostname in groups['ceilometer-central']
         or inventory_hostname in groups['ceilometer-notification']
diff --git a/ansible/roles/ceilometer/tasks/upgrade.yml b/ansible/roles/ceilometer/tasks/upgrade.yml
index c0e3b19a40..308053080c 100644
--- a/ansible/roles/ceilometer/tasks/upgrade.yml
+++ b/ansible/roles/ceilometer/tasks/upgrade.yml
@@ -4,4 +4,3 @@
 - include: bootstrap_service.yml
 
 - include: start.yml
-  serial: "30%"
diff --git a/ansible/roles/ceph/tasks/reconfigure.yml b/ansible/roles/ceph/tasks/reconfigure.yml
index 05d13ad1dc..a725c8324c 100644
--- a/ansible/roles/ceph/tasks/reconfigure.yml
+++ b/ansible/roles/ceph/tasks/reconfigure.yml
@@ -1,6 +1,5 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['ceph-mon']
         or inventory_hostname in groups['ceph-rgw']
         or inventory_hostname in groups['ceph-osd']
diff --git a/ansible/roles/ceph/tasks/upgrade.yml b/ansible/roles/ceph/tasks/upgrade.yml
index db8bf0730f..bf1c4ffde6 100644
--- a/ansible/roles/ceph/tasks/upgrade.yml
+++ b/ansible/roles/ceph/tasks/upgrade.yml
@@ -2,15 +2,12 @@
 - include: config.yml
 
 - include: start_mons.yml
-  serial: "1"
   when: inventory_hostname in groups['ceph-mon']
 
 - include: start_osds.yml
-  serial: "1"
   when: inventory_hostname in groups['ceph-osd']
 
 - include: start_rgws.yml
-  serial: "30%"
   when:
     - inventory_hostname in groups['ceph-rgw']
     - enable_ceph_rgw | bool
diff --git a/ansible/roles/cinder/tasks/reconfigure.yml b/ansible/roles/cinder/tasks/reconfigure.yml
index 82618690f2..844ed9e3e8 100644
--- a/ansible/roles/cinder/tasks/reconfigure.yml
+++ b/ansible/roles/cinder/tasks/reconfigure.yml
@@ -1,6 +1,5 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['cinder-api']
         or inventory_hostname in groups['cinder-scheduler']
         or inventory_hostname in groups['cinder-volume']
diff --git a/ansible/roles/cinder/tasks/upgrade.yml b/ansible/roles/cinder/tasks/upgrade.yml
index c0e3b19a40..308053080c 100644
--- a/ansible/roles/cinder/tasks/upgrade.yml
+++ b/ansible/roles/cinder/tasks/upgrade.yml
@@ -4,4 +4,3 @@
 - include: bootstrap_service.yml
 
 - include: start.yml
-  serial: "30%"
diff --git a/ansible/roles/cloudkitty/tasks/reconfigure.yml b/ansible/roles/cloudkitty/tasks/reconfigure.yml
index 10686f208f..6180f5be60 100644
--- a/ansible/roles/cloudkitty/tasks/reconfigure.yml
+++ b/ansible/roles/cloudkitty/tasks/reconfigure.yml
@@ -1,5 +1,4 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['cloudkitty-api']
         or inventory_hostname in groups['cloudkitty-processor']
diff --git a/ansible/roles/cloudkitty/tasks/upgrade.yml b/ansible/roles/cloudkitty/tasks/upgrade.yml
index c0e3b19a40..308053080c 100644
--- a/ansible/roles/cloudkitty/tasks/upgrade.yml
+++ b/ansible/roles/cloudkitty/tasks/upgrade.yml
@@ -4,4 +4,3 @@
 - include: bootstrap_service.yml
 
 - include: start.yml
-  serial: "30%"
diff --git a/ansible/roles/common/tasks/reconfigure.yml b/ansible/roles/common/tasks/reconfigure.yml
index 66933249bb..2a1e32d9c2 100644
--- a/ansible/roles/common/tasks/reconfigure.yml
+++ b/ansible/roles/common/tasks/reconfigure.yml
@@ -1,3 +1,2 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
diff --git a/ansible/roles/elasticsearch/tasks/reconfigure.yml b/ansible/roles/elasticsearch/tasks/reconfigure.yml
index 1e1abf2494..59fd9b0aaf 100644
--- a/ansible/roles/elasticsearch/tasks/reconfigure.yml
+++ b/ansible/roles/elasticsearch/tasks/reconfigure.yml
@@ -1,4 +1,3 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups ['elasticsearch']
diff --git a/ansible/roles/elasticsearch/tasks/upgrade.yml b/ansible/roles/elasticsearch/tasks/upgrade.yml
index 4586b4fabc..1f16915ad9 100644
--- a/ansible/roles/elasticsearch/tasks/upgrade.yml
+++ b/ansible/roles/elasticsearch/tasks/upgrade.yml
@@ -2,4 +2,3 @@
 - include: config.yml
 
 - include: start.yml
-  serial: "30%"
diff --git a/ansible/roles/glance/tasks/reconfigure.yml b/ansible/roles/glance/tasks/reconfigure.yml
index 45cd23bb6e..73bb13a731 100644
--- a/ansible/roles/glance/tasks/reconfigure.yml
+++ b/ansible/roles/glance/tasks/reconfigure.yml
@@ -1,5 +1,4 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['glance-api']
         or inventory_hostname in groups['glance-registry']
diff --git a/ansible/roles/glance/tasks/upgrade.yml b/ansible/roles/glance/tasks/upgrade.yml
index c0e3b19a40..308053080c 100644
--- a/ansible/roles/glance/tasks/upgrade.yml
+++ b/ansible/roles/glance/tasks/upgrade.yml
@@ -4,4 +4,3 @@
 - include: bootstrap_service.yml
 
 - include: start.yml
-  serial: "30%"
diff --git a/ansible/roles/gnocchi/tasks/reconfigure.yml b/ansible/roles/gnocchi/tasks/reconfigure.yml
index 2191b65ecc..2f926a551b 100644
--- a/ansible/roles/gnocchi/tasks/reconfigure.yml
+++ b/ansible/roles/gnocchi/tasks/reconfigure.yml
@@ -1,6 +1,5 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['gnocchi-api']
         or inventory_hostname in groups['gnocchi-metricd']
         or inventory_hostname in groups['gnocchi-statsd']
diff --git a/ansible/roles/haproxy/tasks/reconfigure.yml b/ansible/roles/haproxy/tasks/reconfigure.yml
index f13bfa5490..ae2aa6b5ec 100644
--- a/ansible/roles/haproxy/tasks/reconfigure.yml
+++ b/ansible/roles/haproxy/tasks/reconfigure.yml
@@ -1,4 +1,3 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['haproxy']
diff --git a/ansible/roles/heat/tasks/reconfigure.yml b/ansible/roles/heat/tasks/reconfigure.yml
index e8cc98f75a..1030a79e4a 100644
--- a/ansible/roles/heat/tasks/reconfigure.yml
+++ b/ansible/roles/heat/tasks/reconfigure.yml
@@ -1,6 +1,5 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['heat-api']
         or inventory_hostname in groups['heat-api-cfn']
         or inventory_hostname in groups['heat-engine']
diff --git a/ansible/roles/heat/tasks/upgrade.yml b/ansible/roles/heat/tasks/upgrade.yml
index c0e3b19a40..308053080c 100644
--- a/ansible/roles/heat/tasks/upgrade.yml
+++ b/ansible/roles/heat/tasks/upgrade.yml
@@ -4,4 +4,3 @@
 - include: bootstrap_service.yml
 
 - include: start.yml
-  serial: "30%"
diff --git a/ansible/roles/horizon/tasks/reconfigure.yml b/ansible/roles/horizon/tasks/reconfigure.yml
index 3e6a838e4e..5d29982134 100644
--- a/ansible/roles/horizon/tasks/reconfigure.yml
+++ b/ansible/roles/horizon/tasks/reconfigure.yml
@@ -1,4 +1,3 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['horizon']
diff --git a/ansible/roles/horizon/tasks/upgrade.yml b/ansible/roles/horizon/tasks/upgrade.yml
index 4586b4fabc..1f16915ad9 100644
--- a/ansible/roles/horizon/tasks/upgrade.yml
+++ b/ansible/roles/horizon/tasks/upgrade.yml
@@ -2,4 +2,3 @@
 - include: config.yml
 
 - include: start.yml
-  serial: "30%"
diff --git a/ansible/roles/ironic/tasks/reconfigure.yml b/ansible/roles/ironic/tasks/reconfigure.yml
index b58050ee22..cac0cb37ea 100644
--- a/ansible/roles/ironic/tasks/reconfigure.yml
+++ b/ansible/roles/ironic/tasks/reconfigure.yml
@@ -1,6 +1,5 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['ironic-pxe']
         or inventory_hostname in groups['ironic-api']
         or inventory_hostname in groups['ironic-conductor']
diff --git a/ansible/roles/ironic/tasks/upgrade.yml b/ansible/roles/ironic/tasks/upgrade.yml
index c0e3b19a40..308053080c 100644
--- a/ansible/roles/ironic/tasks/upgrade.yml
+++ b/ansible/roles/ironic/tasks/upgrade.yml
@@ -4,4 +4,3 @@
 - include: bootstrap_service.yml
 
 - include: start.yml
-  serial: "30%"
diff --git a/ansible/roles/iscsi/tasks/upgrade.yml b/ansible/roles/iscsi/tasks/upgrade.yml
index 4586b4fabc..1f16915ad9 100644
--- a/ansible/roles/iscsi/tasks/upgrade.yml
+++ b/ansible/roles/iscsi/tasks/upgrade.yml
@@ -2,4 +2,3 @@
 - include: config.yml
 
 - include: start.yml
-  serial: "30%"
diff --git a/ansible/roles/keystone/tasks/reconfigure.yml b/ansible/roles/keystone/tasks/reconfigure.yml
index 69636c82df..c73548ba60 100644
--- a/ansible/roles/keystone/tasks/reconfigure.yml
+++ b/ansible/roles/keystone/tasks/reconfigure.yml
@@ -1,4 +1,3 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['keystone']
diff --git a/ansible/roles/keystone/tasks/upgrade.yml b/ansible/roles/keystone/tasks/upgrade.yml
index c0e3b19a40..308053080c 100644
--- a/ansible/roles/keystone/tasks/upgrade.yml
+++ b/ansible/roles/keystone/tasks/upgrade.yml
@@ -4,4 +4,3 @@
 - include: bootstrap_service.yml
 
 - include: start.yml
-  serial: "30%"
diff --git a/ansible/roles/magnum/tasks/reconfigure.yml b/ansible/roles/magnum/tasks/reconfigure.yml
index 043bd24809..7d428522be 100644
--- a/ansible/roles/magnum/tasks/reconfigure.yml
+++ b/ansible/roles/magnum/tasks/reconfigure.yml
@@ -1,5 +1,4 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['magnum-api']
         or inventory_hostname in groups['magnum-conductor']
diff --git a/ansible/roles/magnum/tasks/upgrade.yml b/ansible/roles/magnum/tasks/upgrade.yml
index c0e3b19a40..308053080c 100644
--- a/ansible/roles/magnum/tasks/upgrade.yml
+++ b/ansible/roles/magnum/tasks/upgrade.yml
@@ -4,4 +4,3 @@
 - include: bootstrap_service.yml
 
 - include: start.yml
-  serial: "30%"
diff --git a/ansible/roles/manila/tasks/reconfigure.yml b/ansible/roles/manila/tasks/reconfigure.yml
index cdfb4785ef..447ff856cd 100644
--- a/ansible/roles/manila/tasks/reconfigure.yml
+++ b/ansible/roles/manila/tasks/reconfigure.yml
@@ -1,6 +1,5 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['manila-api']
         or inventory_hostname in groups['manila-scheduler']
         or inventory_hostname in groups['manila-share']
diff --git a/ansible/roles/manila/tasks/upgrade.yml b/ansible/roles/manila/tasks/upgrade.yml
index c0e3b19a40..308053080c 100644
--- a/ansible/roles/manila/tasks/upgrade.yml
+++ b/ansible/roles/manila/tasks/upgrade.yml
@@ -4,4 +4,3 @@
 - include: bootstrap_service.yml
 
 - include: start.yml
-  serial: "30%"
diff --git a/ansible/roles/mariadb/tasks/reconfigure.yml b/ansible/roles/mariadb/tasks/reconfigure.yml
index 35359f0a00..f28f4269ac 100644
--- a/ansible/roles/mariadb/tasks/reconfigure.yml
+++ b/ansible/roles/mariadb/tasks/reconfigure.yml
@@ -1,4 +1,3 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['mariadb']
diff --git a/ansible/roles/mariadb/tasks/upgrade.yml b/ansible/roles/mariadb/tasks/upgrade.yml
index 2c7b49f7e5..1a28252304 100644
--- a/ansible/roles/mariadb/tasks/upgrade.yml
+++ b/ansible/roles/mariadb/tasks/upgrade.yml
@@ -4,6 +4,5 @@
 - include: lookup_cluster.yml
 
 - include: do_upgrade.yml
-  serial: "30%"
 
 - include: check.yml
diff --git a/ansible/roles/memcached/tasks/reconfigure.yml b/ansible/roles/memcached/tasks/reconfigure.yml
index e85a638653..d4f3c676af 100644
--- a/ansible/roles/memcached/tasks/reconfigure.yml
+++ b/ansible/roles/memcached/tasks/reconfigure.yml
@@ -1,4 +1,3 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups ['memcached']
diff --git a/ansible/roles/memcached/tasks/upgrade.yml b/ansible/roles/memcached/tasks/upgrade.yml
index 4586b4fabc..1f16915ad9 100644
--- a/ansible/roles/memcached/tasks/upgrade.yml
+++ b/ansible/roles/memcached/tasks/upgrade.yml
@@ -2,4 +2,3 @@
 - include: config.yml
 
 - include: start.yml
-  serial: "30%"
diff --git a/ansible/roles/mistral/tasks/reconfigure.yml b/ansible/roles/mistral/tasks/reconfigure.yml
index 0d90278698..47757ff537 100644
--- a/ansible/roles/mistral/tasks/reconfigure.yml
+++ b/ansible/roles/mistral/tasks/reconfigure.yml
@@ -1,6 +1,5 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['mistral-api']
         or inventory_hostname in groups['mistral-engine']
         or inventory_hostname in groups['mistral-executor']
diff --git a/ansible/roles/mistral/tasks/upgrade.yml b/ansible/roles/mistral/tasks/upgrade.yml
index c0e3b19a40..308053080c 100644
--- a/ansible/roles/mistral/tasks/upgrade.yml
+++ b/ansible/roles/mistral/tasks/upgrade.yml
@@ -4,4 +4,3 @@
 - include: bootstrap_service.yml
 
 - include: start.yml
-  serial: "30%"
diff --git a/ansible/roles/mongodb/tasks/reconfigure.yml b/ansible/roles/mongodb/tasks/reconfigure.yml
index fe291c425e..4a59d8bc5c 100644
--- a/ansible/roles/mongodb/tasks/reconfigure.yml
+++ b/ansible/roles/mongodb/tasks/reconfigure.yml
@@ -1,4 +1,3 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['mongodb']
diff --git a/ansible/roles/multipathd/tasks/upgrade.yml b/ansible/roles/multipathd/tasks/upgrade.yml
index 4586b4fabc..1f16915ad9 100644
--- a/ansible/roles/multipathd/tasks/upgrade.yml
+++ b/ansible/roles/multipathd/tasks/upgrade.yml
@@ -2,4 +2,3 @@
 - include: config.yml
 
 - include: start.yml
-  serial: "30%"
diff --git a/ansible/roles/murano/tasks/reconfigure.yml b/ansible/roles/murano/tasks/reconfigure.yml
index f3d529d42f..60ce412725 100644
--- a/ansible/roles/murano/tasks/reconfigure.yml
+++ b/ansible/roles/murano/tasks/reconfigure.yml
@@ -1,5 +1,4 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['murano-api']
         or inventory_hostname in groups['murano-engine']
diff --git a/ansible/roles/murano/tasks/upgrade.yml b/ansible/roles/murano/tasks/upgrade.yml
index c0e3b19a40..308053080c 100644
--- a/ansible/roles/murano/tasks/upgrade.yml
+++ b/ansible/roles/murano/tasks/upgrade.yml
@@ -4,4 +4,3 @@
 - include: bootstrap_service.yml
 
 - include: start.yml
-  serial: "30%"
diff --git a/ansible/roles/neutron/tasks/reconfigure.yml b/ansible/roles/neutron/tasks/reconfigure.yml
index 0cac05ddad..5d63da5895 100644
--- a/ansible/roles/neutron/tasks/reconfigure.yml
+++ b/ansible/roles/neutron/tasks/reconfigure.yml
@@ -1,6 +1,5 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['neutron-server']
         or (enable_manila | bool and inventory_hostname in groups['manila-share'])
         or inventory_hostname in groups['compute']
diff --git a/ansible/roles/neutron/tasks/upgrade.yml b/ansible/roles/neutron/tasks/upgrade.yml
index a904606dac..3667e75a72 100644
--- a/ansible/roles/neutron/tasks/upgrade.yml
+++ b/ansible/roles/neutron/tasks/upgrade.yml
@@ -16,7 +16,6 @@
   when: inventory_hostname in groups['neutron-server']
 
 - include: start.yml
-  serial: "%30"
   when: inventory_hostname in groups['compute']
         or inventory_hostname in groups['neutron-dhcp-agent']
         or inventory_hostname in groups['neutron-l3-agent']
diff --git a/ansible/roles/nova/tasks/reconfigure.yml b/ansible/roles/nova/tasks/reconfigure.yml
index 5c4cf7d3eb..af5164ee8d 100644
--- a/ansible/roles/nova/tasks/reconfigure.yml
+++ b/ansible/roles/nova/tasks/reconfigure.yml
@@ -1,6 +1,5 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['compute']
         or inventory_hostname in groups['nova-conductor']
         or inventory_hostname in groups['nova-api']
diff --git a/ansible/roles/nova/tasks/upgrade.yml b/ansible/roles/nova/tasks/upgrade.yml
index 2e7cb4a029..bc24e375e1 100644
--- a/ansible/roles/nova/tasks/upgrade.yml
+++ b/ansible/roles/nova/tasks/upgrade.yml
@@ -32,10 +32,7 @@
 - include: start_conductors.yml
 
 - include: start_controllers.yml
-  serial: "30%"
 
 - include: start_compute.yml
-  serial: "10%"
 
 - include: reload.yml
-  serial: "30%"
diff --git a/ansible/roles/rabbitmq/tasks/reconfigure.yml b/ansible/roles/rabbitmq/tasks/reconfigure.yml
index 1b35460419..03cbcb70ed 100644
--- a/ansible/roles/rabbitmq/tasks/reconfigure.yml
+++ b/ansible/roles/rabbitmq/tasks/reconfigure.yml
@@ -1,4 +1,3 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['rabbitmq']
diff --git a/ansible/roles/rally/tasks/reconfigure.yml b/ansible/roles/rally/tasks/reconfigure.yml
index 66933249bb..2a1e32d9c2 100644
--- a/ansible/roles/rally/tasks/reconfigure.yml
+++ b/ansible/roles/rally/tasks/reconfigure.yml
@@ -1,3 +1,2 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
diff --git a/ansible/roles/sahara/tasks/reconfigure.yml b/ansible/roles/sahara/tasks/reconfigure.yml
index 02e4477ad8..44748272af 100644
--- a/ansible/roles/sahara/tasks/reconfigure.yml
+++ b/ansible/roles/sahara/tasks/reconfigure.yml
@@ -1,5 +1,4 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['sahara-api']
-        or inventory_hostname in groups['sahara-engine']
\ No newline at end of file
+        or inventory_hostname in groups['sahara-engine']
diff --git a/ansible/roles/swift/tasks/reconfigure.yml b/ansible/roles/swift/tasks/reconfigure.yml
index 939817bae2..267bb70df1 100644
--- a/ansible/roles/swift/tasks/reconfigure.yml
+++ b/ansible/roles/swift/tasks/reconfigure.yml
@@ -1,6 +1,5 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['swift-account-server'] or
         inventory_hostname in groups['swift-container-server'] or
         inventory_hostname in groups['swift-object-server'] or
diff --git a/ansible/roles/swift/tasks/upgrade.yml b/ansible/roles/swift/tasks/upgrade.yml
index d5206331e9..667a6d45e8 100644
--- a/ansible/roles/swift/tasks/upgrade.yml
+++ b/ansible/roles/swift/tasks/upgrade.yml
@@ -2,4 +2,3 @@
 - include: config.yml
 
 - include: stop_and_start.yml
-  serial: "30%"
diff --git a/ansible/roles/tempest/tasks/reconfigure.yml b/ansible/roles/tempest/tasks/reconfigure.yml
index 66933249bb..2a1e32d9c2 100644
--- a/ansible/roles/tempest/tasks/reconfigure.yml
+++ b/ansible/roles/tempest/tasks/reconfigure.yml
@@ -1,3 +1,2 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
diff --git a/ansible/roles/watcher/tasks/reconfigure.yml b/ansible/roles/watcher/tasks/reconfigure.yml
index 4a07987a59..1dee3652df 100644
--- a/ansible/roles/watcher/tasks/reconfigure.yml
+++ b/ansible/roles/watcher/tasks/reconfigure.yml
@@ -1,6 +1,5 @@
 ---
 - include: do_reconfigure.yml
-  serial: "30%"
   when: inventory_hostname in groups['watcher-api']
         or inventory_hostname in groups['watcher-engine']
         or inventory_hostname in groups['watcher-applier']
diff --git a/ansible/roles/watcher/tasks/upgrade.yml b/ansible/roles/watcher/tasks/upgrade.yml
index c0e3b19a40..308053080c 100644
--- a/ansible/roles/watcher/tasks/upgrade.yml
+++ b/ansible/roles/watcher/tasks/upgrade.yml
@@ -4,4 +4,3 @@
 - include: bootstrap_service.yml
 
 - include: start.yml
-  serial: "30%"
diff --git a/ansible/site.yml b/ansible/site.yml
index 7f8c415843..6f87631de6 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -3,6 +3,7 @@
     - ceph-mon
     - ceph-osd
     - ceph-rgw
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: ceph,
         tags: ceph,
@@ -15,6 +16,7 @@
         when: enable_collectd | bool }
 
 - hosts: elasticsearch
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: elasticsearch,
         tags: elasticsearch,
@@ -27,24 +29,28 @@
         when: enable_influxdb | bool }
 
 - hosts: haproxy
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: haproxy,
         tags: haproxy,
         when: enable_haproxy | bool }
 
 - hosts: kibana
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: kibana,
         tags: kibana,
         when: enable_kibana | bool }
 
 - hosts: memcached
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: memcached,
         tags: [memcache, memcached],
         when: enable_memcached | bool }
 
 - hosts: mariadb
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: mariadb,
         tags: mariadb,
@@ -53,6 +59,7 @@
 - hosts:
     - iscsid
     - tgtd
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: iscsi,
         tags: iscsi,
@@ -60,12 +67,14 @@
 
 - hosts:
     - multipathd
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: multipathd,
         tags: multipathd,
         when: enable_multipathd | bool }
 
 - hosts: rabbitmq
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: rabbitmq,
         tags: rabbitmq,
@@ -74,6 +83,7 @@
 - hosts:
     - keystone
     - memcached
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: keystone,
         tags: keystone,
@@ -86,6 +96,7 @@
     - swift-proxy-server
     - rabbitmq
     - memcached
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: swift,
         tags: swift,
@@ -97,6 +108,7 @@
     - glance-registry
     - rabbitmq
     - memcached
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: glance,
         tags: glance,
@@ -113,6 +125,7 @@
     - nova-scheduler
     - rabbitmq
     - memcached
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: nova,
         tags: nova,
@@ -130,6 +143,7 @@
     - manila-share
     - rabbitmq
     - memcached
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: neutron,
         tags: neutron,
@@ -143,6 +157,7 @@
     - cinder-volume
     - rabbitmq
     - memcached
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: cinder,
         tags: cinder,
@@ -154,6 +169,7 @@
     - heat-engine
     - rabbitmq
     - memcached
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: heat,
         tags: heat,
@@ -162,6 +178,7 @@
 - hosts:
     - horizon
     - memcached
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: horizon,
         tags: horizon,
@@ -172,6 +189,7 @@
     - murano-engine
     - rabbitmq
     - memcached
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: murano,
         tags: murano,
@@ -184,6 +202,7 @@
     - ironic-pxe
     - rabbitmq
     - memcached
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: ironic,
         tags: ironic,
@@ -194,6 +213,7 @@
     - magnum-conductor
     - rabbitmq
     - memcached
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: magnum,
         tags: magnum,
@@ -205,6 +225,7 @@
     - mistral-executor
     - rabbitmq
     - memcached
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: mistral,
         tags: mistral,
@@ -213,6 +234,7 @@
 - hosts:
     - sahara-api
     - sahara-engine
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: sahara,
         tags: sahara,
@@ -220,6 +242,7 @@
 
 - hosts:
     - mongodb
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: mongodb,
         tags: mongodb,
@@ -231,6 +254,7 @@
     - manila-scheduler
     - rabbitmq
     - memcached
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: manila,
         tags: manila,
@@ -240,6 +264,7 @@
     - gnocchi-api
     - gnocchi-metricd
     - gnocchi-statsd
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: gnocchi,
         tags: gnocchi,
@@ -248,6 +273,7 @@
 - hosts:
     - ceilometer
     - compute
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: ceilometer,
         tags: ceilometer,
@@ -257,6 +283,7 @@
     - aodh
     - rabbitmq
     - memcached
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: aodh,
         tags: aodh,
@@ -277,6 +304,7 @@
     - congress-datasource
     - rabbitmq
     - memcached
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: congress,
         tags: congress,
@@ -284,12 +312,14 @@
 
 - hosts:
     - tempest
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: tempest,
         tags: tempest,
         when: enable_tempest | bool }
 
 - hosts: rally
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: rally,
         tags: rally,
@@ -301,6 +331,7 @@
     - watcher-applier
     - rabbitmq
     - memcached
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: watcher,
         tags: watcher,
@@ -309,6 +340,7 @@
 - hosts:
     - cloudkitty-api
     - cloudkitty-processor
+  serial: '{{ "30%" if action == "upgrade" else "0" }}'
   roles:
     - { role: cloudkitty,
         tags: cloudkitty,