diff --git a/data/global_hiera_params/common.yaml b/data/global_hiera_params/common.yaml
index 1233d08..8785575 100644
--- a/data/global_hiera_params/common.yaml
+++ b/data/global_hiera_params/common.yaml
@@ -17,3 +17,5 @@ network_type: per-tenant-router
 # supports gre or vlan
 tenant_network_type: gre
 enable_ha: false
+
+install_tempest: false
diff --git a/data/hiera_data/common.yaml b/data/hiera_data/common.yaml
index ae00dbd..2ab0907 100644
--- a/data/hiera_data/common.yaml
+++ b/data/hiera_data/common.yaml
@@ -51,3 +51,11 @@ apache::mpm_module: prefork
 
 # Fix odd behaviors
 horizon::django_debug: true
+
+# Tempest configuration
+openstack::provision::identity_uri: 'http://127.0.0.1:5000/v2.0/'
+openstack::provision::admin_tenant_name: openstack
+openstack::provision::admin_password: Cisco123
+openstack::provision::resize_available: false
+openstack::provision::change_password_available: false
+openstack::provision::public_network_name: nova
diff --git a/data/nodes/2_role.yaml b/data/nodes/2_role.yaml
index 7d22078..5b038c9 100644
--- a/data/nodes/2_role.yaml
+++ b/data/nodes/2_role.yaml
@@ -36,6 +36,7 @@ nodes:
       - 'pw-mirror-network'
       - 'apt-packages'
       - 'cloud-init-log'
+      - 'git-proxy'
       - 'puppet-modules'
       - 'hiera-config'
       - 'puppet-master-fact'
@@ -63,7 +64,9 @@ nodes:
       - 'pw-mirror-network'
       - 'apt-packages'
       - 'cloud-init-log'
-      - 'puppet-modules-lite'
+      - 'git-proxy'
+      - 'puppet-modules'
+      - 'puppet-agent-fact'
       - 'hiera-config'
       - 'puppet-setup'
       - 'WAIT_stack build-server'
@@ -85,7 +88,9 @@ nodes:
       - 'pw-mirror-network'
       - 'apt-packages'
       - 'cloud-init-log'
-      - 'puppet-modules-lite'
+      - 'git-proxy'
+      - 'puppet-modules'
+      - 'puppet-agent-fact'
       - 'hiera-config'
       - 'puppet-setup'
       - 'WAIT_stack build-server'
diff --git a/data/scenarios/install_tempest/true.yaml b/data/scenarios/install_tempest/true.yaml
new file mode 100644
index 0000000..0738a47
--- /dev/null
+++ b/data/scenarios/install_tempest/true.yaml
@@ -0,0 +1,6 @@
+roles:
+  controller:
+    classes:
+      - openstack::provision
+
+
diff --git a/manifests/setup.pp b/manifests/setup.pp
index 067829c..6c4f0ed 100644
--- a/manifests/setup.pp
+++ b/manifests/setup.pp
@@ -24,7 +24,6 @@ case $::osfamily {
     $pkg_list       = ['git', 'curl', 'vim', 'cobbler']
     package { 'puppet-common':
       ensure => $puppet_version,
-      require => Apt::Source[puppetlabs]
     }
   }
 }
@@ -41,6 +40,14 @@ if $::build_server_ip {
   }
 }
 
+if $::apt_proxy_host {
+
+  class { 'apt':
+    proxy_host => $::apt_proxy_host,
+    proxy_port => $::apt_proxy_port
+  }
+}
+
 #
 # configure data or all machines who
 # have run mode set to master or apply
@@ -75,6 +82,7 @@ if $::puppet_run_mode != 'agent' {
   - user.common
   - "osfamily/%{osfamily}"
   - "enable_ha/%{enable_ha}"
+  - "install_tempest/%{install_tempest}"
   - "cinder_backend/%{cinder_backend}"
   - "glance_backend/%{glance_backend}"
   - "rpc_type/%{rpc_type}"
diff --git a/stack-builder/build.py b/stack-builder/build.py
index d2e1a10..68a72dd 100644
--- a/stack-builder/build.py
+++ b/stack-builder/build.py
@@ -339,7 +339,11 @@ def cli_get(n,q,k,args):
     for test_id, servers in run_instances.items():
         print "Test ID: " + test_id
         for server in servers:
-            print "%-8.8s %16.16s %12.12s" % (server.id, server.name, str(server.networks['ci'][0]))
+            if 'ci' in server.networks:
+                print "%-16.16s %16.16s %12.12s" % (str(server.networks['ci'][0]), server.name, server.id)
+            else:
+                print "%-16.16s %16.16s %12.12s" % ('-', server.name, server.id)
+
 
 def get(n, q, k, args):
     run_instances = {}
diff --git a/stack-builder/fragments/apt-packages b/stack-builder/fragments/apt-packages
index e23c750..d0f2978 100644
--- a/stack-builder/fragments/apt-packages
+++ b/stack-builder/fragments/apt-packages
@@ -1,2 +1,2 @@
 apt-get update
-apt-get install -y puppet git rubygems curl python-yaml apache2
+apt-get install -y puppet git rubygems curl python-yaml apache2 socat
diff --git a/stack-builder/fragments/git-proxy b/stack-builder/fragments/git-proxy
new file mode 100644
index 0000000..dbd6774
--- /dev/null
+++ b/stack-builder/fragments/git-proxy
@@ -0,0 +1,7 @@
+echo '#!/bin/bash' > /usr/bin/gitproxy
+echo '_proxy=%{apt_proxy_host}'  >> /usr/bin/gitproxy
+echo '_proxyport=%{apt_proxy_port}' >> /usr/bin/gitproxy
+echo 'exec socat STDIO PROXY:$_proxy:$1:$2,proxyport=$_proxyport' >> /usr/bin/gitproxy
+chmod a+x /usr/bin/gitproxy
+git config --system core.gitproxy gitproxy
+
diff --git a/stack-builder/fragments/puppet-agent-fact b/stack-builder/fragments/puppet-agent-fact
new file mode 100644
index 0000000..c68f358
--- /dev/null
+++ b/stack-builder/fragments/puppet-agent-fact
@@ -0,0 +1,3 @@
+# By default, setup.pp will omit some components
+# required by puppet master
+export FACTER_puppet_run_mode=agent
diff --git a/stack-builder/fragments/puppet-modules b/stack-builder/fragments/puppet-modules
index fda9a34..dc9aab0 100644
--- a/stack-builder/fragments/puppet-modules
+++ b/stack-builder/fragments/puppet-modules
@@ -6,7 +6,7 @@ export GEM_HOME=`pwd`/vendor
 gem install thor --no-ri --no-rdoc
 git clone https://github.com/bodepd/librarian-puppet-simple.git vendor/librarian-puppet-simple
 export PATH=`pwd`/vendor/librarian-puppet-simple/bin/:$PATH
-export git_protocol='https'
+export git_protocol=%{git_protocol}
 export openstack_version=%{openstack_version}
 librarian-puppet install --verbose --path /etc/puppet/modules
 
diff --git a/stack-builder/fragments/puppet-setup b/stack-builder/fragments/puppet-setup
index 28bacbd..08f6375 100644
--- a/stack-builder/fragments/puppet-setup
+++ b/stack-builder/fragments/puppet-setup
@@ -1,2 +1,2 @@
 # Install the latest puppet and purge the old puppet
-puppet apply manifests/setup.pp
+puppet apply manifests/setup.pp --certname setup_cert