diff --git a/templates/etc/ansible/hosts.j2 b/templates/etc/ansible/hosts.j2
new file mode 100644
index 0000000..742a35a
--- /dev/null
+++ b/templates/etc/ansible/hosts.j2
@@ -0,0 +1,14 @@
+[localhost]
+127.0.0.1 hostname={{ ansible_fqdn }}
+
+[services]
+juju
+mysql
+rabbitmq-server
+keystone
+glance
+nova-cloud-controller
+quantum-gateway
+openstack-dashboard
+ceilometer
+nagios
diff --git a/templates/etc/cron.d/ansible-pull.j2 b/templates/etc/cron.d/ansible-pull.j2
new file mode 100644
index 0000000..12f3f6d
--- /dev/null
+++ b/templates/etc/cron.d/ansible-pull.j2
@@ -0,0 +1,2 @@
+# Cron job to git clone/pull a repo and then run locally
+{{ schedule }} {{ cron_user }} ansible-pull -o -d {{ workdir }} -U {{ repo_url }} >>{{ logfile }} 2>&1
diff --git a/templates/etc/hosts.j2 b/templates/etc/hosts.j2
new file mode 100644
index 0000000..f153b6e
--- /dev/null
+++ b/templates/etc/hosts.j2
@@ -0,0 +1,17 @@
+127.0.0.1	localhost
+127.0.1.1	ubuntu
+{{ juju_ip.stdout }} juju
+{{ mysql_ip.stdout }} mysql
+{{ rabbitmq_ip.stdout }} rabbitmq-server
+{{ keystone_ip.stdout }} keystone
+{{ glance_ip.stdout }} glance
+{{ novacc_ip.stdout }} nova-cloud-controller
+{{ quantum_ip.stdout }} quantum-gateway
+{{ horizon_ip.stdout }} openstack-dashboard
+{{ ceilometer_ip.stdout }} ceilometer
+{{ nagios_ip.stdout }} nagios
+
+# The following lines are desirable for IPv6 capable hosts
+::1     localhost ip6-localhost ip6-loopback
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
diff --git a/templates/etc/logrotate.d/ansible-pull.j2 b/templates/etc/logrotate.d/ansible-pull.j2
new file mode 100644
index 0000000..e396f31
--- /dev/null
+++ b/templates/etc/logrotate.d/ansible-pull.j2
@@ -0,0 +1,7 @@
+{{ logfile }} {
+  rotate 7
+  daily
+  compress
+  missingok
+  notifempty
+}
diff --git a/templates/etc/rc.local b/templates/etc/rc.local
new file mode 100644
index 0000000..7eb7ab1
--- /dev/null
+++ b/templates/etc/rc.local
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+#
+# rc.local
+#
+# This script is executed at the end of each multiuser runlevel.
+# Make sure that the script will "exit 0" on success or any other
+# value on error.
+#
+# In order to enable or disable this script just change the execution
+# bits.
+
+route add -net {{ control_net }} gw {{ gateway }} || true
+
+exit 0
\ No newline at end of file