diff --git a/reposync/centos.repo b/reposync/centos.repo
index bcf0b70..9442179 100644
--- a/reposync/centos.repo
+++ b/reposync/centos.repo
@@ -21,3 +21,9 @@ name=CentOS Updates 6
 baseurl=http://mirror.centos.org/centos/6/updates/x86_64
 enabled=1
 gpgcheck=0
+
+[scl-6]
+name=CentOS SCL 6
+baseurl=http://dev.centos.org/centos/6/SCL/x86_64/
+enabled=1
+gpgcheck=0
diff --git a/reposync/foreman.repo b/reposync/foreman.repo
new file mode 100644
index 0000000..7e52010
--- /dev/null
+++ b/reposync/foreman.repo
@@ -0,0 +1,11 @@
+[foreman-6]
+name=Foreman for el 6
+baseurl=http://yum.theforeman.org/releases/1.5/el6/x86_64/
+enabled=1
+gpgcheck=0
+
+[foreman-7]
+name=Foreman for el 7
+baseurl=http://yum.theforeman.org/releases/latest/el7/x86_64/
+enabled=1
+gpgcheck=0
diff --git a/reposync/rdo-openstack-beta.repo b/reposync/rdo-openstack-beta.repo
new file mode 100644
index 0000000..9150d4e
--- /dev/null
+++ b/reposync/rdo-openstack-beta.repo
@@ -0,0 +1,5 @@
+[rdo-beta]
+name=rdo-beta
+baseurl=http://copr-be.cloud.fedoraproject.org/results/jruzicka/rdo-juno-epel-7/epel-7-x86_64/
+enabled=1
+gpgcheck=0
diff --git a/xcat/c7-os/controller.synclist b/xcat/c7-os/controller.synclist
deleted file mode 100644
index e69de29..0000000
diff --git a/xcat/osimages/c6-os-foreman.osimage b/xcat/osimages/c6-os-foreman.osimage
new file mode 100644
index 0000000..d00cef3
--- /dev/null
+++ b/xcat/osimages/c6-os-foreman.osimage
@@ -0,0 +1,21 @@
+# <xCAT data object stanza file>
+
+c6-os-foreman:
+    objtype=osimage
+    addkcmdline=biosdevname=1
+    groups=all
+    imagetype=linux
+    osarch=x86_64
+    osname=Linux
+    osvers=centos6.5
+    otherpkgdir=/install/post/otherpkgs/el6
+    otherpkglist=/install/templates/c6-os/foreman.otherpkgs.pkglist
+    partitionfile=/install/templates/c6-os/foreman.partfile
+    pkgdir=/install/centos6.5/x86_64,/install/centos6.5/updates/x86_64
+    pkglist=/install/templates/c6-os/foreman.pkglist
+    postbootscripts=confignics
+    postscripts=hardeths
+    profile=foreman
+    provmethod=install
+    synclists=/install/templates/c6-os/foreman.synclist
+    template=/opt/xcat/share/xcat/install/centos/compute.centos6.tmpl
diff --git a/xcat/osimages/c6-os.osimage b/xcat/osimages/c6-os.osimage
index a5d7b41..c849431 100644
--- a/xcat/osimages/c6-os.osimage
+++ b/xcat/osimages/c6-os.osimage
@@ -1,19 +1,19 @@
 # <xCAT data object stanza file>
 
-c7-os-juno-nova:
+c6-os:
     objtype=osimage
     imagetype=linux
     osarch=x86_64
     osname=Linux
-    osvers=centos7.0
-    otherpkgdir=/install/post/otherpkgs/el7
-    otherpkglist=/install/templates/c7-os/nova.juno.otherpkgs.pkglist
-    partitionfile=/install/templates/c7-os/nova.partfile
-    pkgdir=/install/centos7.0/x86_64,/install/centos7.0/updates/x86_64
-    pkglist=/install/templates/c7-os/nova.pkglist
-    postbootscripts=confignics
+    osvers=centos6.5
+    otherpkgdir=/install/post/otherpkgs/el6
+    otherpkglist=/install/templates/c6-os/controller.otherpkgs.pkglist
+    partitionfile=/install/templates/c6-os/controller.partfile
+    pkgdir=/install/centos6.5/x86_64,/install/centos6.5/updates/x86_64
+    pkglist=/install/templates/c6-os/controller.pkglist
+    postbootscripts=confignics,packstack-openstack,add_glance_images
     postscripts=hardeths
-    profile=nova
+    profile=controller
     provmethod=install
-    synclists=/install/templates/c7-os/nova.synclist
-    template=/install/templates/c7-os/common.juno.tmpl
+    synclists=/install/templates/c6-os/controller.synclist
+    template=/opt/xcat/share/xcat/install/centos/compute.centos6.tmpl
diff --git a/xcat/osimages/c7-os-juno-nova.osimage b/xcat/osimages/c7-os-juno-nova.osimage
index a5d7b41..e97722e 100644
--- a/xcat/osimages/c7-os-juno-nova.osimage
+++ b/xcat/osimages/c7-os-juno-nova.osimage
@@ -16,4 +16,4 @@ c7-os-juno-nova:
     profile=nova
     provmethod=install
     synclists=/install/templates/c7-os/nova.synclist
-    template=/install/templates/c7-os/common.juno.tmpl
+    template=/install/templates/c7-os/common.tmpl
diff --git a/xcat/osimages/c7-os-juno.osimage b/xcat/osimages/c7-os-juno.osimage
index 6ed8991..ad00216 100644
--- a/xcat/osimages/c7-os-juno.osimage
+++ b/xcat/osimages/c7-os-juno.osimage
@@ -11,9 +11,9 @@ c7-os-juno:
     partitionfile=/install/templates/c7-os/controller.partfile
     pkgdir=/install/centos7.0/x86_64,/install/centos7.0/updates/x86_64
     pkglist=/install/templates/c7-os/controller.pkglist
-    postbootscripts=setup_extnw -n xcat_pub,packstack-openstack,add_glance_images
+    postbootscripts=setup_extnw -n stack_pub,configOvsBridge bridgeprereq enp2s1f1:br-ex,packstack-openstack,add_glance_images
     postscripts=confignics,hardeths
     profile=controller
     provmethod=install
     synclists=/install/templates/c7-os/controller.synclist
-    template=/install/templates/c7-os/common.juno.tmpl
+    template=/install/templates/c7-os/common.tmpl
diff --git a/xcat/osimages/c7-os-nova.osimage b/xcat/osimages/c7-os-nova.osimage
index 964767e..7141d18 100644
--- a/xcat/osimages/c7-os-nova.osimage
+++ b/xcat/osimages/c7-os-nova.osimage
@@ -16,4 +16,4 @@ c7-os-nova:
     profile=nova
     provmethod=install
     synclists=/install/templates/c7-os/nova.synclist
-    template=/opt/xcat/share/xcat/install/rh/compute.rhel7.tmpl
+    template=/install/templates/c7-os/common.tmpl
diff --git a/xcat/osimages/c7-os.osimage b/xcat/osimages/c7-os.osimage
index 32fb42a..dd4e2f0 100644
--- a/xcat/osimages/c7-os.osimage
+++ b/xcat/osimages/c7-os.osimage
@@ -11,9 +11,9 @@ c7-os:
     partitionfile=/install/templates/c7-os/controller.partfile
     pkgdir=/install/centos7.0/x86_64,/install/centos7.0/updates/x86_64
     pkglist=/install/templates/c7-os/controller.pkglist
-    postbootscripts=setup_extnw -n xcat_pub,packstack-openstack,add_glance_images
+    postbootscripts=setup_extnw -n stack_pub,configOvsBridge bridgeprereq enp2s1f1:br-ex,packstack-openstack,add_glance_images
     postscripts=confignics,hardeths
     profile=controller
     provmethod=install
     synclists=/install/templates/c7-os/controller.synclist
-    template=/opt/xcat/share/xcat/install/rh/compute.rhel7.tmpl
+    template=/install/templates/c7-os/common.tmpl
diff --git a/xcat/osimages/rh7-os-nova.osimage b/xcat/osimages/rh7-os-nova.osimage
new file mode 100644
index 0000000..c640d01
--- /dev/null
+++ b/xcat/osimages/rh7-os-nova.osimage
@@ -0,0 +1,19 @@
+# <xCAT data object stanza file>
+
+rh7-os-nova:
+    objtype=osimage
+    imagetype=linux
+    osarch=x86_64
+    osname=Linux
+    osvers=rhels7.0
+    otherpkgdir=/install/post/otherpkgs/el7
+    otherpkglist=/install/templates/rh7-os/nova.otherpkgs.pkglist
+    partitionfile=/install/templates/rh7-os/nova.partfile
+    pkgdir=/install/rhels7.0/x86_64,/install/rhels7.0/updates/x86_64
+    pkglist=/install/templates/rh7-os/nova.pkglist
+    postbootscripts=confignics
+    postscripts=hardeths
+    profile=nova
+    provmethod=install
+    synclists=/install/templates/rh7-os/nova.synclist
+    template=/install/templates/rh7-os/common.tmpl
diff --git a/xcat/osimages/rh7-os.osimage b/xcat/osimages/rh7-os.osimage
new file mode 100644
index 0000000..647d477
--- /dev/null
+++ b/xcat/osimages/rh7-os.osimage
@@ -0,0 +1,19 @@
+# <xCAT data object stanza file>
+
+rh7-os:
+    objtype=osimage
+    imagetype=linux
+    osarch=x86_64
+    osname=Linux
+    osvers=rhels7.0
+    otherpkgdir=/install/post/otherpkgs/el7
+    otherpkglist=/install/templates/rh7-os/controller.otherpkgs.pkglist
+    partitionfile=/install/templates/rh7-os/controller.partfile
+    pkgdir=/install/rhels7.0/x86_64,/install/rhels7.0/updates/x86_64
+    pkglist=/install/templates/rh7-os/controller.pkglist
+    postbootscripts=setup_extnw -n stack_pub,configOvsBridge bridgeprereq enp2s1f1:br-ex,packstack-openstack,add_glance_images
+    postscripts=confignics,hardeths
+    profile=controller
+    provmethod=install
+    synclists=/install/templates/rh7-os/controller.synclist
+    template=/install/templates/rh7-os/common.tmpl
diff --git a/xcat/c6-os/controller.otherpkgs.pkglist b/xcat/templates/c6-os/controller.otherpkgs.pkglist
similarity index 100%
rename from xcat/c6-os/controller.otherpkgs.pkglist
rename to xcat/templates/c6-os/controller.otherpkgs.pkglist
diff --git a/xcat/c6-os/controller.partfile b/xcat/templates/c6-os/controller.partfile
similarity index 100%
rename from xcat/c6-os/controller.partfile
rename to xcat/templates/c6-os/controller.partfile
diff --git a/xcat/c6-os/controller.pkglist b/xcat/templates/c6-os/controller.pkglist
similarity index 100%
rename from xcat/c6-os/controller.pkglist
rename to xcat/templates/c6-os/controller.pkglist
diff --git a/xcat/templates/c6-os/foreman.otherpkgs.pkglist b/xcat/templates/c6-os/foreman.otherpkgs.pkglist
new file mode 100644
index 0000000..719f599
--- /dev/null
+++ b/xcat/templates/c6-os/foreman.otherpkgs.pkglist
@@ -0,0 +1,20 @@
+# OpenStack Foreman
+rdo-openstack/openstack-foreman-installer
+
+# Puppet
+puppet/puppet
+
+# foreman
+foreman/foreman
+
+# Ruby
+scl/ruby193-rubygems
+scl/ruby193-rubygem-sqlite3
+
+# Dependancy for foreman-installer
+extras/centos-release-SCL
+
+# Other deps
+epel/rubygem-json
+
+misc/ruby193-rubygem-foreman_simplify
diff --git a/xcat/c6-os/nova.partfile b/xcat/templates/c6-os/foreman.partfile
similarity index 100%
rename from xcat/c6-os/nova.partfile
rename to xcat/templates/c6-os/foreman.partfile
diff --git a/xcat/c6-os/nova.pkglist b/xcat/templates/c6-os/foreman.pkglist
similarity index 100%
rename from xcat/c6-os/nova.pkglist
rename to xcat/templates/c6-os/foreman.pkglist
diff --git a/xcat/c6-os/nova.otherpkgs.pkglist b/xcat/templates/c6-os/nova.otherpkgs.pkglist
similarity index 100%
rename from xcat/c6-os/nova.otherpkgs.pkglist
rename to xcat/templates/c6-os/nova.otherpkgs.pkglist
diff --git a/xcat/c7-os/nova.partfile b/xcat/templates/c6-os/nova.partfile
similarity index 100%
rename from xcat/c7-os/nova.partfile
rename to xcat/templates/c6-os/nova.partfile
diff --git a/xcat/templates/c6-os/nova.pkglist b/xcat/templates/c6-os/nova.pkglist
new file mode 100644
index 0000000..76db804
--- /dev/null
+++ b/xcat/templates/c6-os/nova.pkglist
@@ -0,0 +1,25 @@
+xauth
+xorg-x11-utils
+kernel-devel
+qemu-kvm
+httpd
+php
+gcc
+glibc
+glibc-common
+scsi-target-utils
+yum-plugin-priorities
+xinetd
+memcached
+mod_wsgi
+mod_ssl
+python-memcached
+gd
+gd-devel
+openssl
+scsi-target-utils
+yum-plugin-priorities
+xinetd
+-*-firmware
+-wpa_supplicant
+-wireless-tools
diff --git a/xcat/c7-os/common.juno.tmpl b/xcat/templates/c7-os/common.juno.tmpl
similarity index 100%
rename from xcat/c7-os/common.juno.tmpl
rename to xcat/templates/c7-os/common.juno.tmpl
diff --git a/xcat/templates/c7-os/common.tmpl b/xcat/templates/c7-os/common.tmpl
new file mode 100644
index 0000000..ae02fe2
--- /dev/null
+++ b/xcat/templates/c7-os/common.tmpl
@@ -0,0 +1,155 @@
+#
+#cmdline
+
+lang en_GB
+#KICKSTARTNET#
+
+#
+# Where's the source?
+# nfs --server hostname.of.server or IP --dir /path/to/RH/CD/image
+#
+#nfs --server #XCATVAR:INSTALL_NFS# --dir #XCATVAR:INSTALL_SRC_DIR#
+
+%include /tmp/repos
+
+#device ethernet e100
+keyboard "uk"
+
+#
+# Clear the MBR
+#
+zerombr
+
+#
+# Wipe out the disk
+#
+clearpart --all --initlabel
+#clearpart --linux
+#key --skip
+
+#
+# Customize to fit your needs
+#
+
+#XCAT_PARTITION_START#
+#No RAID
+#/boot really significant for this sort of setup nowadays?
+#part /boot --size 50 --fstype ext3
+%include /tmp/partitioning
+#part swap --size 1024 
+#part / --size 1 --grow --fstype ext4
+#XCAT_PARTITION_END#
+
+#RAID 0 /scr for performance
+#part / --size 1024 --ondisk sda
+#part swap --size 512 --ondisk sda
+#part /var --size 1024 --ondisk sdb
+#part swap --size 512 --ondisk sdb
+#part raid.01 --size 1 --grow --ondisk sda
+#part raid.02 --size 1 --grow --ondisk sdb
+#raid /scr --level 0 --device md0 raid.01 raid.02
+
+#Full RAID 1 Sample
+#part raid.01 --size 50 --ondisk sda
+#part raid.02 --size 50 --ondisk sdb
+#raid /boot --level 1 --device md0 raid.01 raid.02
+#
+#part raid.11 --size 1024 --ondisk sda
+#part raid.12 --size 1024 --ondisk sdb
+#raid / --level 1 --device md1 raid.11 raid.12
+#
+#part raid.21 --size 1024 --ondisk sda
+#part raid.22 --size 1024 --ondisk sdb
+#raid /var --level 1 --device md2 raid.21 raid.22
+#
+#part raid.31 --size 1024 --ondisk sda
+#part raid.32 --size 1024 --ondisk sdb
+#raid swap --level 1 --device md3 raid.31 raid.32
+#
+#part raid.41 --size 1 --grow --ondisk sda
+#part raid.42 --size 1 --grow --ondisk sdb
+#raid /scr --level 1 --device md4 raid.41 raid.42
+
+#
+# bootloader config
+# --append <args>
+# --useLilo
+# --md5pass <crypted MD5 password for GRUB>
+#
+bootloader
+
+#
+# install or upgrade
+#
+install
+
+#
+# text mode install (default is graphical)
+#
+text
+
+#
+# firewall
+#
+#firewall --disabled
+
+#
+# Select a zone
+# Add the --utc switch if your hardware clock is set to GMT
+#
+#timezone US/Hawaii
+#timezone US/Pacific
+#timezone US/Mountain
+#timezone US/Central
+#timezone US/Eastern
+timezone --utc "#TABLE:site:key=timezone:value#"
+
+#
+# Don't do X
+#
+skipx
+
+
+#
+# To generate an encrypted root password use:
+#
+# perl -e 'print crypt("blah","Xa") . "\n";'p
+# openssl passwd -apr1 -salt xxxxxxxx password
+# 
+# where "blah" is your root password.
+#
+#rootpw --iscrypted XaLGAVe1C41x2
+#rootpw XaLGAVe1C41x2 --iscrypted
+rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
+
+#
+# NIS setup: auth --enablenis --nisdomain sensenet 
+# --nisserver neptune --useshadow --enablemd5
+#
+# OR
+auth --useshadow --enablemd5
+
+
+#
+# SE Linux
+#
+#selinux --permissive
+selinux --disabled
+
+#
+# Reboot after installation
+#
+reboot
+
+#
+#end of section
+#
+%packages
+#INCLUDE_DEFAULT_PKGLIST#
+%end
+%pre
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh.rhel7#
+%end
+%post
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat#
+%end
diff --git a/xcat/templates/c7-os/controller.juno.otherpkgs.pkglist b/xcat/templates/c7-os/controller.juno.otherpkgs.pkglist
new file mode 100644
index 0000000..f7c8c7f
--- /dev/null
+++ b/xcat/templates/c7-os/controller.juno.otherpkgs.pkglist
@@ -0,0 +1,70 @@
+## PackStack/Puppet
+epel/puppet
+#puppet/puppet
+rdo-openstack-juno/openstack-packstack
+rdo-openstack-juno/openstack-puppet-modules
+epel/erlang
+
+## Pre-reqs
+rdo-openstack-juno/mariadb-galera-server
+rdo-openstack-juno/rabbitmq-server
+
+## OpenStack Deps
+rdo-openstack-juno/openstack-utils
+rdo-openstack-juno/openstack-selinux
+
+## Nova
+rdo-openstack-juno/openstack-nova
+rdo-openstack-juno/openstack-nova-novncproxy
+rdo-openstack-juno/openstack-nova-console
+
+## Neutron
+rdo-openstack-juno/openstack-neutron
+rdo-openstack-juno/openstack-neutron-ml2
+rdo-openstack-juno/openstack-neutron-openvswitch
+rdo-openstack-juno/openvswitch
+
+## Glance
+rdo-openstack-juno/openstack-glance
+
+## KeyStone
+rdo-openstack-juno/openstack-keystone
+
+## Swift
+rdo-openstack-juno/openstack-swift
+rdo-openstack-juno/openstack-swift-proxy
+rdo-openstack-juno/openstack-swift-object
+rdo-openstack-juno/openstack-swift-container
+rdo-openstack-juno/openstack-swift-account
+
+## Dashboard
+rdo-openstack-juno/openstack-dashboard
+
+## Telemetry
+rdo-openstack-juno/mongodb-server
+rdo-openstack-juno/openstack-ceilometer-*
+rdo-openstack-juno/python-ceilometer
+rdo-openstack-juno/python-ceilometerclient
+
+## Cinder
+rdo-openstack-juno/openstack-cinder
+
+## Heat
+rdo-openstack-juno/openstack-heat-api
+rdo-openstack-juno/openstack-heat-api-cfn
+
+## Ironic
+rdo-openstack-juno/openstack-ironic-api
+rdo-openstack-juno/openstack-ironic-conductor
+rdo-openstack-juno/python-ironicclient
+
+## Nagios
+epel/nagios
+epel/nagios-devel
+epel/nagios-plugins-nrpe
+epel/nagios-plugins-ping
+epel/nrpe
+
+## Misc
+epel/scsi-target-utils
+extras/python-itsdangerous
diff --git a/xcat/c7-os/controller.otherpkgs.pkglist b/xcat/templates/c7-os/controller.otherpkgs.pkglist
similarity index 100%
rename from xcat/c7-os/controller.otherpkgs.pkglist
rename to xcat/templates/c7-os/controller.otherpkgs.pkglist
diff --git a/xcat/templates/c7-os/controller.partfile b/xcat/templates/c7-os/controller.partfile
new file mode 100644
index 0000000..aaf71c9
--- /dev/null
+++ b/xcat/templates/c7-os/controller.partfile
@@ -0,0 +1,9 @@
+part /boot --fstype=ext4 --size=1024
+part /boot/efi --fstype=vfat --size=100
+part pv.1 --grow --size=1
+
+volgroup system --pesize=4096 pv.1
+
+logvol / --fstype=ext4 --name=root --vgname=system --size=20480
+logvol swap --name=swap --vgname=system --size=4096
+logvol /var --fstype=ext4 --name=var --vgname=system --size=40960
diff --git a/xcat/templates/c7-os/controller.pkglist b/xcat/templates/c7-os/controller.pkglist
new file mode 100644
index 0000000..21d97e7
--- /dev/null
+++ b/xcat/templates/c7-os/controller.pkglist
@@ -0,0 +1,31 @@
+#INCLUDE:/opt/xcat/share/xcat/install/rh/compute.rhel7.pkglist#
+gcc
+gd
+gd-devel
+glibc
+glibc.i686
+glibc-common
+httpd
+kernel-devel
+memcached
+mod_ssl
+mod_wsgi
+openssl
+pacemaker
+pacemaker-cli
+pacemaker-cluster-libs
+pacemaker-libs
+pacemaker-libs-devel
+patch
+pcs
+php
+python-memcached
+qemu-kvm
+xinetd
+xauth
+xorg-x11-utils
+yum-plugin-priorities
+yum-utils
+-*-firmware
+-wpa_supplicant
+-wireless-tools
diff --git a/xcat/templates/c7-os/controller.synclist b/xcat/templates/c7-os/controller.synclist
new file mode 100644
index 0000000..f3504e5
--- /dev/null
+++ b/xcat/templates/c7-os/controller.synclist
@@ -0,0 +1,4 @@
+
+APPEND:
+/install/syncfiles/hosts.allow.append -> /etc/hosts.allow
+/install/syncfiles/hosts.deny.append -> /etc/hosts.deny
diff --git a/xcat/c7-os/nova.juno.otherpkgs.pkglist b/xcat/templates/c7-os/nova.juno.otherpkgs.pkglist
similarity index 97%
rename from xcat/c7-os/nova.juno.otherpkgs.pkglist
rename to xcat/templates/c7-os/nova.juno.otherpkgs.pkglist
index 24cda0b..c60b5de 100644
--- a/xcat/c7-os/nova.juno.otherpkgs.pkglist
+++ b/xcat/templates/c7-os/nova.juno.otherpkgs.pkglist
@@ -1,5 +1,5 @@
 ## PackStack/Puppet
-puppet/puppet
+epel/puppet
 
 ## OpenStack Deps
 rdo-openstack-juno/openstack-utils
diff --git a/xcat/c7-os/nova.otherpkgs.pkglist b/xcat/templates/c7-os/nova.otherpkgs.pkglist
similarity index 91%
rename from xcat/c7-os/nova.otherpkgs.pkglist
rename to xcat/templates/c7-os/nova.otherpkgs.pkglist
index 5385614..d398847 100644
--- a/xcat/c7-os/nova.otherpkgs.pkglist
+++ b/xcat/templates/c7-os/nova.otherpkgs.pkglist
@@ -1,5 +1,5 @@
 ## PackStack/Puppet
-puppet/puppet
+epel/puppet
 
 ## OpenStack Deps
 rdo-openstack/openstack-utils
@@ -22,3 +22,4 @@ epel/nrpe
 
 ## Misc
 epel/scsi-target-utils
+extras/python-greenlet
diff --git a/xcat/c7-os/controller.partfile b/xcat/templates/c7-os/nova.partfile
similarity index 100%
rename from xcat/c7-os/controller.partfile
rename to xcat/templates/c7-os/nova.partfile
diff --git a/xcat/c7-os/nova.pkglist b/xcat/templates/c7-os/nova.pkglist
similarity index 100%
rename from xcat/c7-os/nova.pkglist
rename to xcat/templates/c7-os/nova.pkglist
diff --git a/xcat/templates/rh7-os/common.tmpl b/xcat/templates/rh7-os/common.tmpl
new file mode 100644
index 0000000..ae02fe2
--- /dev/null
+++ b/xcat/templates/rh7-os/common.tmpl
@@ -0,0 +1,155 @@
+#
+#cmdline
+
+lang en_GB
+#KICKSTARTNET#
+
+#
+# Where's the source?
+# nfs --server hostname.of.server or IP --dir /path/to/RH/CD/image
+#
+#nfs --server #XCATVAR:INSTALL_NFS# --dir #XCATVAR:INSTALL_SRC_DIR#
+
+%include /tmp/repos
+
+#device ethernet e100
+keyboard "uk"
+
+#
+# Clear the MBR
+#
+zerombr
+
+#
+# Wipe out the disk
+#
+clearpart --all --initlabel
+#clearpart --linux
+#key --skip
+
+#
+# Customize to fit your needs
+#
+
+#XCAT_PARTITION_START#
+#No RAID
+#/boot really significant for this sort of setup nowadays?
+#part /boot --size 50 --fstype ext3
+%include /tmp/partitioning
+#part swap --size 1024 
+#part / --size 1 --grow --fstype ext4
+#XCAT_PARTITION_END#
+
+#RAID 0 /scr for performance
+#part / --size 1024 --ondisk sda
+#part swap --size 512 --ondisk sda
+#part /var --size 1024 --ondisk sdb
+#part swap --size 512 --ondisk sdb
+#part raid.01 --size 1 --grow --ondisk sda
+#part raid.02 --size 1 --grow --ondisk sdb
+#raid /scr --level 0 --device md0 raid.01 raid.02
+
+#Full RAID 1 Sample
+#part raid.01 --size 50 --ondisk sda
+#part raid.02 --size 50 --ondisk sdb
+#raid /boot --level 1 --device md0 raid.01 raid.02
+#
+#part raid.11 --size 1024 --ondisk sda
+#part raid.12 --size 1024 --ondisk sdb
+#raid / --level 1 --device md1 raid.11 raid.12
+#
+#part raid.21 --size 1024 --ondisk sda
+#part raid.22 --size 1024 --ondisk sdb
+#raid /var --level 1 --device md2 raid.21 raid.22
+#
+#part raid.31 --size 1024 --ondisk sda
+#part raid.32 --size 1024 --ondisk sdb
+#raid swap --level 1 --device md3 raid.31 raid.32
+#
+#part raid.41 --size 1 --grow --ondisk sda
+#part raid.42 --size 1 --grow --ondisk sdb
+#raid /scr --level 1 --device md4 raid.41 raid.42
+
+#
+# bootloader config
+# --append <args>
+# --useLilo
+# --md5pass <crypted MD5 password for GRUB>
+#
+bootloader
+
+#
+# install or upgrade
+#
+install
+
+#
+# text mode install (default is graphical)
+#
+text
+
+#
+# firewall
+#
+#firewall --disabled
+
+#
+# Select a zone
+# Add the --utc switch if your hardware clock is set to GMT
+#
+#timezone US/Hawaii
+#timezone US/Pacific
+#timezone US/Mountain
+#timezone US/Central
+#timezone US/Eastern
+timezone --utc "#TABLE:site:key=timezone:value#"
+
+#
+# Don't do X
+#
+skipx
+
+
+#
+# To generate an encrypted root password use:
+#
+# perl -e 'print crypt("blah","Xa") . "\n";'p
+# openssl passwd -apr1 -salt xxxxxxxx password
+# 
+# where "blah" is your root password.
+#
+#rootpw --iscrypted XaLGAVe1C41x2
+#rootpw XaLGAVe1C41x2 --iscrypted
+rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
+
+#
+# NIS setup: auth --enablenis --nisdomain sensenet 
+# --nisserver neptune --useshadow --enablemd5
+#
+# OR
+auth --useshadow --enablemd5
+
+
+#
+# SE Linux
+#
+#selinux --permissive
+selinux --disabled
+
+#
+# Reboot after installation
+#
+reboot
+
+#
+#end of section
+#
+%packages
+#INCLUDE_DEFAULT_PKGLIST#
+%end
+%pre
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh.rhel7#
+%end
+%post
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat#
+%end
diff --git a/xcat/c7-os/controller.juno.otherpkgs.pkglist b/xcat/templates/rh7-os/controller.juno.otherpkgs.pkglist
similarity index 100%
rename from xcat/c7-os/controller.juno.otherpkgs.pkglist
rename to xcat/templates/rh7-os/controller.juno.otherpkgs.pkglist
diff --git a/xcat/templates/rh7-os/controller.otherpkgs.pkglist b/xcat/templates/rh7-os/controller.otherpkgs.pkglist
new file mode 100644
index 0000000..08172a5
--- /dev/null
+++ b/xcat/templates/rh7-os/controller.otherpkgs.pkglist
@@ -0,0 +1,72 @@
+## PackStack/Puppet
+rhosp5/puppet
+rhosp5/openstack-packstack
+rhosp5/openstack-puppet-modules
+rhosp5/erlang
+
+## Pre-reqs
+rhosp5/mariadb-galera-server
+rhosp5/rabbitmq-server
+
+## OpenStack Deps
+rhosp5/openstack-utils
+rhosp5/openstack-selinux
+
+## Nova
+rhosp5/openstack-nova
+rhosp5/openstack-nova-novncproxy
+rhosp5/openstack-nova-console
+
+## Neutron
+rhosp5/openstack-neutron
+rhosp5/openstack-neutron-ml2
+rhosp5/openstack-neutron-openvswitch
+rhosp5/openvswitch
+
+## Glance
+rhosp5/openstack-glance
+
+## KeyStone
+rhosp5/openstack-keystone
+
+## Swift
+rhosp5/openstack-swift
+rhosp5/openstack-swift-proxy
+rhosp5/openstack-swift-object
+rhosp5/openstack-swift-container
+rhosp5/openstack-swift-account
+
+## Dashboard
+rhosp5/openstack-dashboard
+
+## Telemetry
+rhosp5/mongodb-server
+rhosp5/openstack-ceilometer-*
+rhosp5/python-ceilometer
+rhosp5/python-ceilometerclient
+
+## Cinder
+rhosp5/openstack-cinder
+
+## Heat
+rhosp5/openstack-heat-api
+
+## Nagios
+rhosp5/nagios
+rhosp5/nagios-devel
+rhosp5/nagios-plugins-nrpe
+rhosp5/nagios-plugins-ping
+rhosp5/nrpe
+
+# HA Stuff
+rh-ha/pacemaker
+rh-ha/pacemaker-cli
+rh-ha/pacemaker-cluster-libs
+rh-ha/pacemaker-libs
+rh-ha/pacemaker-libs-devel
+rh-ha/pcs
+
+# DRBD Stuff
+#drbd/drbd-km-3.10.0_123.el7.x86_64
+#drbd/drbd-pacemaker
+#drbd/drbd
diff --git a/xcat/templates/rh7-os/controller.partfile b/xcat/templates/rh7-os/controller.partfile
new file mode 100644
index 0000000..f7fac11
--- /dev/null
+++ b/xcat/templates/rh7-os/controller.partfile
@@ -0,0 +1,9 @@
+part /boot --fstype=ext4 --size=1024
+part /boot/efi --fstype=vfat --size=100
+part pv.1 --grow --size=1
+
+volgroup system --pesize=4096 pv.1
+
+logvol / --fstype=ext4 --name=root --vgname=system --size=20480
+logvol swap --name=swap --vgname=system --size=8192
+logvol /var --fstype=ext4 --name=var --vgname=system --size=40960
diff --git a/xcat/c7-os/controller.pkglist b/xcat/templates/rh7-os/controller.pkglist
similarity index 89%
rename from xcat/c7-os/controller.pkglist
rename to xcat/templates/rh7-os/controller.pkglist
index 911c37a..75997e6 100644
--- a/xcat/c7-os/controller.pkglist
+++ b/xcat/templates/rh7-os/controller.pkglist
@@ -1,7 +1,7 @@
 #INCLUDE:/opt/xcat/share/xcat/install/rh/compute.rhel7.pkglist#
+fence-agents-ipmilan
 gcc
 gd
-gd-devel
 glibc
 glibc.i686
 glibc-common
@@ -18,7 +18,6 @@ qemu-kvm
 xinetd
 xauth
 xorg-x11-utils
-yum-plugin-priorities
 yum-utils
 -*-firmware
 -wpa_supplicant
diff --git a/xcat/templates/rh7-os/controller.synclist b/xcat/templates/rh7-os/controller.synclist
new file mode 100644
index 0000000..f3504e5
--- /dev/null
+++ b/xcat/templates/rh7-os/controller.synclist
@@ -0,0 +1,4 @@
+
+APPEND:
+/install/syncfiles/hosts.allow.append -> /etc/hosts.allow
+/install/syncfiles/hosts.deny.append -> /etc/hosts.deny
diff --git a/xcat/templates/rh7-os/nova.juno.otherpkgs.pkglist b/xcat/templates/rh7-os/nova.juno.otherpkgs.pkglist
new file mode 100644
index 0000000..c60b5de
--- /dev/null
+++ b/xcat/templates/rh7-os/nova.juno.otherpkgs.pkglist
@@ -0,0 +1,25 @@
+## PackStack/Puppet
+epel/puppet
+
+## OpenStack Deps
+rdo-openstack-juno/openstack-utils
+rdo-openstack-juno/openstack-selinux
+
+## Nova
+rdo-openstack-juno/openstack-nova-compute
+
+## Neutron
+rdo-openstack-juno/openstack-neutron
+rdo-openstack-juno/openstack-neutron-openvswitch
+rdo-openstack-juno/openstack-neutron-ml2
+
+## Telemetry
+rdo-openstack-juno/openstack-ceilometer-compute
+
+## Nagios
+epel/nagios-plugins*
+epel/nrpe
+
+## Misc
+epel/scsi-target-utils
+extras/python-greenlet
diff --git a/xcat/templates/rh7-os/nova.otherpkgs.pkglist b/xcat/templates/rh7-os/nova.otherpkgs.pkglist
new file mode 100644
index 0000000..587e4ac
--- /dev/null
+++ b/xcat/templates/rh7-os/nova.otherpkgs.pkglist
@@ -0,0 +1,24 @@
+## PackStack/Puppet
+rhosp5/puppet
+
+## OpenStack Deps
+rhosp5/openstack-utils
+rhosp5/openstack-selinux
+
+## Nova
+rhosp5/openstack-nova-compute
+
+## Neutron
+rhosp5/openstack-neutron
+rhosp5/openstack-neutron-openvswitch
+rhosp5/openstack-neutron-ml2
+
+## Telemetry
+rhosp5/openstack-ceilometer-compute
+
+## Nagios
+rhosp5/nagios-plugins*
+rhosp5/nrpe
+
+## Misc
+#rhosp5/scsi-target-utils
diff --git a/xcat/templates/rh7-os/nova.partfile b/xcat/templates/rh7-os/nova.partfile
new file mode 100644
index 0000000..f7fac11
--- /dev/null
+++ b/xcat/templates/rh7-os/nova.partfile
@@ -0,0 +1,9 @@
+part /boot --fstype=ext4 --size=1024
+part /boot/efi --fstype=vfat --size=100
+part pv.1 --grow --size=1
+
+volgroup system --pesize=4096 pv.1
+
+logvol / --fstype=ext4 --name=root --vgname=system --size=20480
+logvol swap --name=swap --vgname=system --size=8192
+logvol /var --fstype=ext4 --name=var --vgname=system --size=40960
diff --git a/xcat/templates/rh7-os/nova.pkglist b/xcat/templates/rh7-os/nova.pkglist
new file mode 100644
index 0000000..2f27d6c
--- /dev/null
+++ b/xcat/templates/rh7-os/nova.pkglist
@@ -0,0 +1,24 @@
+#INCLUDE:/opt/xcat/share/xcat/install/rh/compute.rhel7.pkglist#
+gcc
+gd
+glibc
+glibc.i686
+glibc-common
+httpd
+kernel-devel
+libvirt
+memcached
+mod_ssl
+mod_wsgi
+openssl
+patch
+php
+python-memcached
+qemu-kvm
+xinetd
+xauth
+xorg-x11-utils
+yum-utils
+-*-firmware
+-wpa_supplicant
+-wireless-tools