diff --git a/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml b/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml
index 6b8b29daf0..f4f72a95fd 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml
@@ -1,5 +1,5 @@
 - job:
-    name: 'check-tripleo-ironic-seed-precise'
+    name: 'check-tripleo-ironic-seed-precise-nonha'
     node: 'tripleo-precise'
 
     wrappers:
@@ -20,6 +20,7 @@
           export GEARDSERVER=192.168.1.1
           export DIB_COMMON_ELEMENTS="common-venv stackuser pypi-openstack"
           export TRIPLEO_TEST=seed
+          export OVERCLOUD_CONTROLSCALE=1
           export USE_IRONIC=1
           sudo chown -hR $(whoami) /opt/git
           function gate_hook {
@@ -40,7 +41,7 @@
       - console-log
 
 - job:
-    name: 'check-tripleo-novabm-undercloud-precise'
+    name: 'check-tripleo-novabm-undercloud-precise-nonha'
     node: 'tripleo-precise'
 
     wrappers:
@@ -61,6 +62,7 @@
           export GEARDSERVER=192.168.1.1
           export DIB_COMMON_ELEMENTS="common-venv stackuser pypi-openstack"
           export TRIPLEO_TEST=undercloud
+          export OVERCLOUD_CONTROLSCALE=1
           export USE_IRONIC=0
           sudo chown -hR $(whoami) /opt/git
           function gate_hook {
@@ -81,7 +83,7 @@
       - console-log
 
 - job:
-    name: 'check-tripleo-ironic-undercloud-precise'
+    name: 'check-tripleo-ironic-undercloud-precise-nonha'
     node: 'tripleo-precise'
 
     wrappers:
@@ -102,6 +104,7 @@
           export GEARDSERVER=192.168.1.1
           export DIB_COMMON_ELEMENTS="common-venv stackuser pypi-openstack"
           export TRIPLEO_TEST=undercloud
+          export OVERCLOUD_CONTROLSCALE=1
           export USE_IRONIC=1
           sudo chown -hR $(whoami) /opt/git
           function gate_hook {
@@ -122,7 +125,7 @@
       - console-log
 
 - job:
-    name: 'check-tripleo-novabm-overcloud-precise'
+    name: 'check-tripleo-novabm-overcloud-precise-nonha'
     node: 'tripleo-precise'
 
     wrappers:
@@ -143,6 +146,7 @@
           export GEARDSERVER=192.168.1.1
           export DIB_COMMON_ELEMENTS="common-venv stackuser pypi-openstack"
           export TRIPLEO_TEST=overcloud
+          export OVERCLOUD_CONTROLSCALE=1
           export USE_IRONIC=0
           sudo chown -hR $(whoami) /opt/git
           function gate_hook {
@@ -163,7 +167,7 @@
       - console-log
 
 - job:
-    name: 'check-tripleo-novabm-overcloud-f20'
+    name: 'check-tripleo-novabm-overcloud-f20-nonha'
     node: 'tripleo-f20'
 
     wrappers:
@@ -185,6 +189,50 @@
           export DIB_COMMON_ELEMENTS="common-venv stackuser pypi-openstack"
           export TRIPLEO_TEST=overcloud
           sudo chown -hR $(whoami) /opt/git
+          export OVERCLOUD_CONTROLSCALE=1
+          function gate_hook {
+              bash -xe /opt/stack/new/tripleo-ci/toci_gate_test.sh
+          }
+          export -f gate_hook
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - scp:
+          site: 'static.openstack.org'
+          files:
+            - target: 'logs/$LOG_PATH'
+              source: 'logs/**'
+              keep-hierarchy: true
+              copy-after-failure: true
+      - console-log
+
+# This job is aiming to become:
+# check-tripleo-ironic-undercloud-overcloud-precise-ha-reboot
+- job:
+    name: 'check-tripleo-ironic-overcloud-precise-ha'
+    node: 'tripleo-precise'
+
+    wrappers:
+      - build-timeout:
+          timeout: 145
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=140
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_EXERCISES=0
+          export GEARDSERVER=192.168.1.1
+          export DIB_COMMON_ELEMENTS="common-venv stackuser pypi-openstack"
+          export TRIPLEO_TEST=overcloud
+          export OVERCLOUD_CONTROLSCALE=3
+          export USE_IRONIC=1
           function gate_hook {
               bash -xe /opt/stack/new/tripleo-ci/toci_gate_test.sh
           }
@@ -203,7 +251,7 @@
       - console-log
 
 - job:
-    name: 'check-tripleo-ironic-vlan-precise'
+    name: 'check-tripleo-ironic-vlan-precise-nonha'
     node: 'tripleo-precise'
 
     wrappers:
@@ -224,6 +272,7 @@
           export GEARDSERVER=192.168.1.1
           export DIB_COMMON_ELEMENTS="common-venv stackuser pypi-openstack"
           export TRIPLEO_TEST=vlan
+          export OVERCLOUD_CONTROLSCALE=1
           export USE_IRONIC=1
           sudo chown -hR $(whoami) /opt/git
           function gate_hook {
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 9964a06ae8..ec0c05742a 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -542,6 +542,8 @@ jobs:
     voting: false
     files:
       - 'modules/openstack_project/files/accessbot/channels.yaml'
+  - name: check-tripleo-ironic-overcloud-precise-ha
+    voting: false
 # Continous publishing from master of the following documentation targets:
   - name: ^.*manuals-upstream-translation-update$
     branch: master
@@ -787,7 +789,7 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise-nonha
     pre-release:
       - cinder-tarball
     release:
@@ -884,10 +886,10 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     pre-release:
       - glance-tarball
     release:
@@ -919,10 +921,10 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     pre-release:
       - glance.store-tarball
     release:
@@ -941,10 +943,11 @@ projects:
     gate:
       - gate-devstack-dsvm-cells
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-precise-ha
     pre-release:
       - heat-tarball
     release:
@@ -992,9 +995,9 @@ projects:
       - check-tempest-dsvm-ironic-postgres
       - check-tempest-dsvm-virtual-ironic
     check-tripleo:
-      - check-tripleo-ironic-undercloud-precise
+      - check-tripleo-ironic-undercloud-precise-nonha
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
+      - check-tripleo-ironic-seed-precise-nonha
     gate:
       - gate-tempest-dsvm-ironic
       - gate-tempest-dsvm-ironic-postgres
@@ -1036,10 +1039,10 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     pre-release:
       - keystone-tarball
     release:
@@ -1110,10 +1113,10 @@ projects:
       - check-neutron-dsvm-api
       - gate-grenade-dsvm-neutron-forward
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     pre-release:
       - neutron-tarball
     release:
@@ -1154,10 +1157,10 @@ projects:
       - check-tempest-dsvm-neutron-pg
       - check-tempest-dsvm-nova-v3-full
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     pre-release:
       - nova-tarball
     release:
@@ -1240,10 +1243,10 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     pre-release:
       - swift-tarball
     release:
@@ -1287,12 +1290,12 @@ projects:
     template:
       - name: python-jobs
     check-tripleo:
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-novabm-overcloud-f20
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-f20-nonha
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     pre-release:
       - tuskar-tarball
     release:
@@ -1355,10 +1358,10 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
 
   - name: openstack/python-designateclient
     template:
@@ -1389,10 +1392,10 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
 
   - name: openstack/python-glanceclient
     template:
@@ -1416,10 +1419,10 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
 
 #TODO: add docs
   - name: openstack/python-heatclient
@@ -1446,10 +1449,10 @@ projects:
       - python-heatclient-branch-tarball
       - python-heatclient-coverage
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     release:
       - python-heatclient-docs
 
@@ -1465,9 +1468,9 @@ projects:
       - check-tempest-dsvm-ironic
       - check-tempest-dsvm-virtual-ironic
     check-tripleo:
-      - check-tripleo-ironic-undercloud-precise
+      - check-tripleo-ironic-undercloud-precise-nonha
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
+      - check-tripleo-ironic-seed-precise-nonha
     gate:
       - gate-python-ironicclient-python33
       - gate-python-ironicclient-pypy
@@ -1495,10 +1498,10 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
 
   - name: openstack/python-marconiclient
     template:
@@ -1535,10 +1538,10 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
 
   - name: openstack/python-novaclient
     template:
@@ -1563,10 +1566,10 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
 
   - name: openstack/python-openstackclient
     template:
@@ -1611,10 +1614,10 @@ projects:
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
 
   - name: openstack/python-troveclient
     template:
@@ -1638,11 +1641,11 @@ projects:
     check:
       - gate-python-tuskarclient-python33
     check-tripleo:
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
+      - check-tripleo-ironic-seed-precise-nonha
 
 # Section: Other OpenStack projects
 
@@ -1657,17 +1660,17 @@ projects:
       - gate-diskimage-builder-python27
       - check-tempest-dsvm-virtual-ironic
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-f20
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-f20-nonha
     gate:
       - gate-diskimage-builder-pep8
       - gate-diskimage-builder-python26
       - gate-diskimage-builder-python27
       - gate-tempest-dsvm-virtual-ironic
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - diskimage-builder-coverage
       - diskimage-builder-branch-tarball
@@ -1679,14 +1682,14 @@ projects:
     check:
       - noop
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-f20
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-f20-nonha
     gate:
       - noop
     experimental-tripleo:
-      - check-tripleo-novabm-overcloud-precise
-      - check-tripleo-ironic-seed-precise
+      - check-tripleo-novabm-overcloud-precise-nonha
+      - check-tripleo-ironic-seed-precise-nonha
     post:
       - dib-utils-branch-tarball
 
@@ -1801,16 +1804,16 @@ projects:
       - gate-os-apply-config-python26
       - gate-os-apply-config-python27
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-f20
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-f20-nonha
     gate:
       - gate-os-apply-config-pep8
       - gate-os-apply-config-python26
       - gate-os-apply-config-python27
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - os-apply-config-coverage
       - os-apply-config-branch-tarball
@@ -1824,16 +1827,16 @@ projects:
       - gate-os-cloud-config-python26
       - gate-os-cloud-config-python27
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-f20
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-f20-nonha
     gate:
       - gate-os-cloud-config-pep8
       - gate-os-cloud-config-python26
       - gate-os-cloud-config-python27
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - os-cloud-config-docs
       - os-cloud-config-coverage
@@ -1849,16 +1852,16 @@ projects:
       - gate-os-collect-config-python26
       - gate-os-collect-config-python27
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-f20
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-f20-nonha
     gate:
       - gate-os-collect-config-pep8
       - gate-os-collect-config-python26
       - gate-os-collect-config-python27
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - os-collect-config-coverage
       - os-collect-config-branch-tarball
@@ -1873,16 +1876,16 @@ projects:
       - gate-os-refresh-config-python26
       - gate-os-refresh-config-python27
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-f20
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-f20-nonha
     gate:
       - gate-os-refresh-config-pep8
       - gate-os-refresh-config-python26
       - gate-os-refresh-config-python27
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - os-refresh-config-coverage
       - os-refresh-config-branch-tarball
@@ -1947,10 +1950,10 @@ projects:
       - gate-oslo.config-python33
       - gate-devstack-dsvm-cells
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
 
   - name: openstack/oslo.db
     template:
@@ -1969,10 +1972,10 @@ projects:
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
 
   - name: openstack/oslo.i18n
     template:
@@ -1990,10 +1993,10 @@ projects:
       - gate-oslo.i18n-python33
       - gate-devstack-dsvm-cells
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
 
   - name: openstack/oslo.messaging
     template:
@@ -2013,10 +2016,10 @@ projects:
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
 
 #TODO: add docs
   - name: openstack/oslo.rootwrap
@@ -2043,10 +2046,10 @@ projects:
     post:
       - oslo.rootwrap-branch-tarball
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
 
   - name: openstack/oslo.utils
     template:
@@ -2076,10 +2079,10 @@ projects:
       - gate-oslo.version-python33
       - gate-devstack-dsvm-cells
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
 
   - name: openstack/oslo.vmware
     template:
@@ -2117,10 +2120,10 @@ projects:
     post:
       - propose-requirements-updates
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
 
 # TODO: add docs
   - name: openstack/sahara-dashboard
@@ -2264,10 +2267,10 @@ projects:
       - check-tempest-master-dsvm-full-havana
       - check-tempest-master-dsvm-neutron-havana
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - tempest-docs
       - tempest-coverage
@@ -2293,14 +2296,15 @@ projects:
     check:
       - noop
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-f20
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-ha
     gate:
       - noop
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - tripleo-heat-templates-branch-tarball
     pre-release:
@@ -2314,14 +2318,15 @@ projects:
     check:
       - noop
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-f20
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-ha
     gate:
       - noop
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - tripleo-image-elements-branch-tarball
 
@@ -2329,15 +2334,16 @@ projects:
     check:
       - gate-tripleo-incubator-docs
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-f20
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-ha
     gate:
       - gate-tripleo-incubator-docs
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-overcloud-precise
-      - check-tripleo-ironic-vlan-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
+      - check-tripleo-ironic-vlan-precise-nonha
     post:
       - tripleo-incubator-docs
     pre-release:
@@ -2377,10 +2383,10 @@ projects:
       - gate-tuskar-ui-python27
       - gate-tuskar-ui-selenium
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - tuskar-ui-branch-tarball
 
@@ -2621,10 +2627,10 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
       - gate-swift-dsvm-functional
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
     post:
       - pbr-docs
     pre-release:
@@ -2740,10 +2746,10 @@ projects:
       - check-tempest-dsvm-aiopcpu
       - check-tempest-dsvm-neutron-aiopcpu
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
 
   - name: openstack-infra/elastic-recheck
     check:
@@ -3138,14 +3144,14 @@ projects:
     check:
       - noop
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise
-      - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-novabm-overcloud-f20
+      - check-tripleo-novabm-undercloud-precise-nonha
+      - check-tripleo-ironic-undercloud-precise-nonha
+      - check-tripleo-novabm-overcloud-f20-nonha
     gate:
       - noop
     experimental-tripleo:
-      - check-tripleo-ironic-seed-precise
-      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-seed-precise-nonha
+      - check-tripleo-novabm-overcloud-precise-nonha
 
   - name: openstack-infra/zmq-event-publisher
     check: