diff --git a/puppet/modules/devstack/files/compute.conf b/puppet/modules/devstack/files/compute.conf
deleted file mode 100644
index 6ea2646..0000000
--- a/puppet/modules/devstack/files/compute.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-[[local|localrc]]
-ENABLED_SERVICES=n-cpu,n-net,c-vol
-MULTI_HOST="True"
-GUEST_INTERFACE_DEFAULT=eth1
-HOST_IP_IFACE=eth1
-DATABASE_TYPE=mysql
-SERVICE_HOST=api.dague.pvt
-MYSQL_HOST=$SERVICE_HOST
-RABBIT_HOST=$SERVICE_HOST
-GLANCE_HOST=$SERVICE_HOST
-DATABASE_PASSWORD=pass
-RABBIT_PASSWORD=pass
-SERVICE_TOKEN=pass
-SERVICE_PASSWORD=pass
-ADMIN_PASSWORD=pass
-API_RATE_LIMIT="False"
-RECLONE="True"
-
-enable_service ceilometer-acompute
-
-[[post-config|$NOVA_CONF]]
-[DEFAULT]
-flat_interface = eth1
-vlan_interface = eth1
diff --git a/puppet/modules/devstack/files/manager.conf b/puppet/modules/devstack/files/manager.conf
deleted file mode 100644
index 919b569..0000000
--- a/puppet/modules/devstack/files/manager.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-[[local|localrc]]
-DATABASE_PASSWORD=pass
-RABBIT_PASSWORD=pass
-SERVICE_TOKEN=pass
-SERVICE_PASSWORD=pass
-ADMIN_PASSWORD=pass
-MULTI_HOST="True"
-API_RATE_LIMIT="False"
-RECLONE="True"
-GUEST_INTERFACE_DEFAULT=eth1
-HOST_IP_IFACE=eth1
-IMAGE_URLS="http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz"
-IMAGE_URLS+=",https://download.fedoraproject.org/pub/fedora/linux/releases/20/Images/x86_64/Fedora-x86_64-20-20131211.1-sda.qcow2"
-IMAGE_URLS+=",https://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img"
-
-enable_service dstat
-enable_service ceilometer-acompute ceilometer-acentral ceilometer-anotification ceilometer-collector ceilometer-api
-enable_service ceilometer-alarm-notifier ceilometer-alarm-evaluator
-
-[[post-config|$NOVA_CONF]]
-[DEFAULT]
-flat_interface = eth1
-vlan_interface = eth1
diff --git a/puppet/modules/devstack/manifests/init.pp b/puppet/modules/devstack/manifests/init.pp
index 8ce6d45..2cebac0 100644
--- a/puppet/modules/devstack/manifests/init.pp
+++ b/puppet/modules/devstack/manifests/init.pp
@@ -27,12 +27,6 @@ class devstack(
     timeout => 1200
   }
 
-  if $is_compute == 'true' {
-    $localrc = 'compute.conf'
-  } else {
-    $localrc = 'manager.conf'
-  }
-
   file { "$dir/local.sh":
     owner => $user,
     group => $user,
@@ -45,7 +39,7 @@ class devstack(
     owner => $user,
     group => $user,
     mode  => 644,
-    source => "puppet:///modules/devstack/$localrc",
+    content => template('devstack/local.erb'),
     require => File["$dir/local.sh"]
   }
 
diff --git a/puppet/modules/devstack/templates/local.erb b/puppet/modules/devstack/templates/local.erb
index 22580c4..a73feb1 100644
--- a/puppet/modules/devstack/templates/local.erb
+++ b/puppet/modules/devstack/templates/local.erb
@@ -9,14 +9,22 @@ API_RATE_LIMIT="False"
 RECLONE="True"
 GUEST_INTERFACE_DEFAULT=eth1
 HOST_IP_IFACE=eth1
-<% if @is_compute %>
-ENABLED_SERVICES=n-cpu,n-net,c-vol
 
+# Enable Logging
+LOGFILE=/opt/stack/logs/stack.sh.log
+VERBOSE=True
+LOG_COLOR=True
+SCREEN_LOGDIR=/opt/stack/logs
+
+<% if @is_compute == "true" %>
+ENABLED_SERVICES=n-cpu,n-net,c-vol
 DATABASE_TYPE=mysql
 SERVICE_HOST=<%= @manager_hostname %>
 MYSQL_HOST=$SERVICE_HOST
 RABBIT_HOST=$SERVICE_HOST
 GLANCE_HOST=$SERVICE_HOST
+
+enable_service ceilometer-acompute
 <% else %>
 # The manager
 IMAGE_URLS="http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz"
@@ -24,6 +32,8 @@ IMAGE_URLS+=",https://download.fedoraproject.org/pub/fedora/linux/releases/20/Im
 IMAGE_URLS+=",https://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img"
 
 enable_service dstat
+enable_service ceilometer-acompute ceilometer-acentral ceilometer-anotification ceilometer-collector ceilometer-api
+enable_service ceilometer-alarm-notifier ceilometer-alarm-evaluator
 
 <% end %>