diff --git a/multi-node-aio/playbooks/group_vars/cinder_hosts.yml b/multi-node-aio/playbooks/group_vars/cinder_hosts.yml
new file mode 100644
index 00000000..6200eac4
--- /dev/null
+++ b/multi-node-aio/playbooks/group_vars/cinder_hosts.yml
@@ -0,0 +1,26 @@
+---
+# Copyright 2017, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in witing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
+
+server_domain_name: 'openstack.local'
+server_vm: true
+server_vm_ram: '{{ cinder_vm_server_ram | default(2048) }}'
+server_vm_vcpus: '{{ cinder_vm_server_vcpus | default(2) }}'
+server_vm_primary_network: 'dhcp'
+server_image: "{{ default_vm_image }}"
+server_default_interface: 'eth0'
+server_preseed_ks: 'vm'
+server_extra_options: ''
diff --git a/multi-node-aio/playbooks/group_vars/compute_hosts.yml b/multi-node-aio/playbooks/group_vars/compute_hosts.yml
new file mode 100644
index 00000000..2ea65f56
--- /dev/null
+++ b/multi-node-aio/playbooks/group_vars/compute_hosts.yml
@@ -0,0 +1,26 @@
+---
+# Copyright 2017, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in witing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
+
+server_domain_name: 'openstack.local'
+server_vm: true
+server_vm_ram: '{{ compute_vm_server_ram | default(8192) }}'
+server_vm_vcpus: '{{ compute_vm_server_vcpus | default(4) }}'
+server_vm_primary_network: 'dhcp'
+server_image: "{{ default_vm_image }}"
+server_default_interface: 'eth0'
+server_preseed_ks: 'vm-compute'
+server_extra_options: ''
diff --git a/multi-node-aio/playbooks/group_vars/infra_hosts.yml b/multi-node-aio/playbooks/group_vars/infra_hosts.yml
new file mode 100644
index 00000000..74c825a2
--- /dev/null
+++ b/multi-node-aio/playbooks/group_vars/infra_hosts.yml
@@ -0,0 +1,26 @@
+---
+# Copyright 2017, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in witing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
+
+server_domain_name: 'openstack.local'                # str  - required, domain name of server
+server_vm: true                                             # bool - not required, used to specify a host is to become a VM
+server_vm_ram: '{{ infra_vm_server_ram | default(8192) }}'  # int  - not required, used to specify ram when provisioning a VM
+server_vm_vcpus: '{{ infra_vm_server_vcpus | default(4) }}' # int  - not required, used to specify vcpus when provisioning a VM
+server_vm_primary_network: 'dhcp'                           # str  - not required, primary network used to kick the VM
+server_image: "{{ default_vm_image }}"                      # str  - required, image name
+server_default_interface: 'eth0'                            # str  - required, default interface
+server_preseed_ks: 'vm'                                     # str  - required, name of preseed/kickstart file
+server_extra_options: ''                                    # str  - not required, added kernel options
diff --git a/multi-node-aio/playbooks/group_vars/loadbalancer_hosts.yml b/multi-node-aio/playbooks/group_vars/loadbalancer_hosts.yml
new file mode 100644
index 00000000..a0e7b694
--- /dev/null
+++ b/multi-node-aio/playbooks/group_vars/loadbalancer_hosts.yml
@@ -0,0 +1,26 @@
+---
+# Copyright 2017, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in witing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
+
+server_domain_name: 'openstack.local'
+server_vm: true
+server_vm_ram: '{{ loadbalancer_vm_server_ram | default(1024) }}'
+server_vm_vcpus: '{{ loadbalancer_vm_server_vcpus | default(1) }}'
+server_vm_primary_network: 'dhcp'
+server_image: "{{ default_vm_image }}"
+server_default_interface: 'eth0'
+server_preseed_ks: 'vm'
+server_extra_options: ''
diff --git a/multi-node-aio/playbooks/group_vars/log_hosts.yml b/multi-node-aio/playbooks/group_vars/log_hosts.yml
new file mode 100644
index 00000000..aef245c5
--- /dev/null
+++ b/multi-node-aio/playbooks/group_vars/log_hosts.yml
@@ -0,0 +1,26 @@
+---
+# Copyright 2017, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in witing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
+
+server_domain_name: 'openstack.local'
+server_vm: true
+server_vm_ram: '{{ logging_vm_server_ram | default(1024) }}'
+server_vm_vcpus: '{{ logging_vm_server_vcpus | default(2) }}'
+server_vm_primary_network: 'dhcp'
+server_image: "{{ default_vm_image }}"
+server_default_interface: 'eth0'
+server_preseed_ks: 'vm'
+server_extra_options: ''
diff --git a/multi-node-aio/playbooks/group_vars/swift_hosts.yml b/multi-node-aio/playbooks/group_vars/swift_hosts.yml
new file mode 100644
index 00000000..281649d6
--- /dev/null
+++ b/multi-node-aio/playbooks/group_vars/swift_hosts.yml
@@ -0,0 +1,26 @@
+---
+# Copyright 2017, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in witing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
+
+server_domain_name: 'openstack.local'
+server_vm: true
+server_vm_ram: '{{ swift_vm_server_ram | default(1024) }}'
+server_vm_vcpus: '{{ swift_vm_server_vcpus | default(2) }}'
+server_vm_primary_network: 'dhcp'
+server_image: "{{ default_vm_image }}"
+server_default_interface: 'eth0'
+server_preseed_ks: 'vm'
+server_extra_options: ''
diff --git a/multi-node-aio/playbooks/host_vars/cinder1.yml b/multi-node-aio/playbooks/host_vars/cinder1.yml
index c8276c4d..58c35dac 100644
--- a/multi-node-aio/playbooks/host_vars/cinder1.yml
+++ b/multi-node-aio/playbooks/host_vars/cinder1.yml
@@ -13,20 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
-
 server_hostname: 'cinder1'
-server_domain_name: 'openstack.local'
-server_vm: true
-server_vm_ram: '{{ cinder_vm_server_ram | default(2048) }}'
-server_vm_vcpus: '{{ cinder_vm_server_vcpus | default(2) }}'
 server_vm_fixed_addr: '10.0.2.130'
-server_vm_primary_network: 'dhcp'
-server_image: "{{ default_vm_image }}"
-server_default_interface: 'eth0'
 server_mac_address: '52:54:00:bd:80:07'
-server_preseed_ks: 'vm'
-server_extra_options: ''
 
 server_networks:
   dhcp:
diff --git a/multi-node-aio/playbooks/host_vars/cinder2.yml b/multi-node-aio/playbooks/host_vars/cinder2.yml
index 60edea40..76a09483 100644
--- a/multi-node-aio/playbooks/host_vars/cinder2.yml
+++ b/multi-node-aio/playbooks/host_vars/cinder2.yml
@@ -13,20 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
-
 server_hostname: 'cinder2'
-server_domain_name: 'openstack.local'
-server_vm: true
-server_vm_ram: '{{ cinder_vm_server_ram | default(2048) }}'
-server_vm_vcpus: '{{ cinder_vm_server_vcpus | default(2) }}'
 server_vm_fixed_addr: '10.0.2.131'
-server_vm_primary_network: 'dhcp'
-server_image: "{{ default_vm_image }}"
-server_default_interface: 'eth0'
 server_mac_address: '52:54:00:bd:80:08'
-server_preseed_ks: 'vm'
-server_extra_options: ''
 
 server_networks:
   dhcp:
diff --git a/multi-node-aio/playbooks/host_vars/compute1.yml b/multi-node-aio/playbooks/host_vars/compute1.yml
index e5cbb180..325d43b7 100644
--- a/multi-node-aio/playbooks/host_vars/compute1.yml
+++ b/multi-node-aio/playbooks/host_vars/compute1.yml
@@ -13,20 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
-
 server_hostname: 'compute1'
-server_domain_name: 'openstack.local'
-server_vm: true
-server_vm_ram: '{{ compute_vm_server_ram | default(8192) }}'
-server_vm_vcpus: '{{ compute_vm_server_vcpus | default(4) }}'
 server_vm_fixed_addr: '10.0.2.120'
-server_vm_primary_network: 'dhcp'
-server_image: "{{ default_vm_image }}"
-server_default_interface: 'eth0'
 server_mac_address: '52:54:00:bd:80:05'
-server_preseed_ks: 'vm-compute'
-server_extra_options: ''
 
 server_networks:
   dhcp:
diff --git a/multi-node-aio/playbooks/host_vars/compute2.yml b/multi-node-aio/playbooks/host_vars/compute2.yml
index 26150b6a..7e0ddab7 100644
--- a/multi-node-aio/playbooks/host_vars/compute2.yml
+++ b/multi-node-aio/playbooks/host_vars/compute2.yml
@@ -13,20 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
-
 server_hostname: 'compute2'
-server_domain_name: 'openstack.local'
-server_vm: true
-server_vm_ram: '{{ compute_vm_server_ram | default(8192) }}'
-server_vm_vcpus: '{{ compute_vm_server_vcpus | default(4) }}'
 server_vm_fixed_addr: '10.0.2.121'
-server_vm_primary_network: 'dhcp'
-server_image: "{{ default_vm_image }}"
-server_default_interface: 'eth0'
 server_mac_address: '52:54:00:bd:80:06'
-server_preseed_ks: 'vm-compute'
-server_extra_options: ''
 
 server_networks:
   dhcp:
diff --git a/multi-node-aio/playbooks/host_vars/infra1.yml b/multi-node-aio/playbooks/host_vars/infra1.yml
index 58900182..96c050b2 100644
--- a/multi-node-aio/playbooks/host_vars/infra1.yml
+++ b/multi-node-aio/playbooks/host_vars/infra1.yml
@@ -13,20 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
-
 server_hostname: 'infra1'                                   # str  - required, hostname of server
-server_domain_name: 'openstack.local'                # str  - required, domain name of server
-server_vm: true                                             # bool - not required, used to specify a host is to become a VM
-server_vm_ram: '{{ infra_vm_server_ram | default(8192) }}'  # int  - not required, used to specify ram when provisioning a VM
-server_vm_vcpus: '{{ infra_vm_server_vcpus | default(4) }}' # int  - not required, used to specify vcpus when provisioning a VM
 server_vm_fixed_addr: '10.0.2.100'                          # str  - not required, used to specify fixed address when using internal DHCPD
-server_vm_primary_network: 'dhcp'                           # str  - not required, primary network used to kick the VM
-server_image: "{{ default_vm_image }}"                      # str  - required, image name
-server_default_interface: 'eth0'                            # str  - required, default interface
 server_mac_address: '52:54:00:bd:80:00'                     # str  - required, mac address of default interface
-server_preseed_ks: 'vm'                                     # str  - required, name of preseed/kickstart file
-server_extra_options: ''                                    # str  - not required, added kernel options
 
 server_networks:                        # dict - required, hash of networks, can be empty, key is used to name the networks.
   dhcp:
diff --git a/multi-node-aio/playbooks/host_vars/infra2.yml b/multi-node-aio/playbooks/host_vars/infra2.yml
index 8c0bde26..fa9641f2 100644
--- a/multi-node-aio/playbooks/host_vars/infra2.yml
+++ b/multi-node-aio/playbooks/host_vars/infra2.yml
@@ -13,20 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
-
 server_hostname: 'infra2'
-server_domain_name: 'openstack.local'
-server_vm: true
-server_vm_ram: '{{ infra_vm_server_ram | default(8192) }}'
-server_vm_vcpus: '{{ infra_vm_server_vcpus | default(4) }}'
 server_vm_fixed_addr: '10.0.2.101'
-server_vm_primary_network: 'dhcp'
-server_image: "{{ default_vm_image }}"
-server_default_interface: 'eth0'
 server_mac_address: '52:54:00:bd:80:01'
-server_preseed_ks: 'vm'
-server_extra_options: ''
 
 server_networks:
   dhcp:
diff --git a/multi-node-aio/playbooks/host_vars/infra3.yml b/multi-node-aio/playbooks/host_vars/infra3.yml
index c553d62e..62c9002d 100644
--- a/multi-node-aio/playbooks/host_vars/infra3.yml
+++ b/multi-node-aio/playbooks/host_vars/infra3.yml
@@ -13,20 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
-
 server_hostname: 'infra3'
-server_domain_name: 'openstack.local'
-server_vm: true
-server_vm_ram: '{{ infra_vm_server_ram | default(8192) }}'
-server_vm_vcpus: '{{ infra_vm_server_vcpus | default(4) }}'
 server_vm_fixed_addr: '10.0.2.102'
-server_vm_primary_network: 'dhcp'
-server_image: "{{ default_vm_image }}"
-server_default_interface: 'eth0'
 server_mac_address: '52:54:00:bd:80:02'
-server_preseed_ks: 'vm'
-server_extra_options: ''
 
 server_networks:
   dhcp:
diff --git a/multi-node-aio/playbooks/host_vars/loadbalancer1.yml b/multi-node-aio/playbooks/host_vars/loadbalancer1.yml
index bfe1867a..9c4a2ae4 100644
--- a/multi-node-aio/playbooks/host_vars/loadbalancer1.yml
+++ b/multi-node-aio/playbooks/host_vars/loadbalancer1.yml
@@ -13,20 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
-
 server_hostname: 'loadbalancer1'
-server_domain_name: 'openstack.local'
-server_vm: true
-server_vm_ram: '{{ loadbalancer_vm_server_ram | default(1024) }}'
-server_vm_vcpus: '{{ loadbalancer_vm_server_vcpus | default(1) }}'
 server_vm_fixed_addr: '10.0.2.150'
-server_vm_primary_network: 'dhcp'
-server_image: "{{ default_vm_image }}"
-server_default_interface: 'eth0'
 server_mac_address: '52:54:00:bd:80:12'
-server_preseed_ks: 'vm'
-server_extra_options: ''
 
 server_networks:
   dhcp:
diff --git a/multi-node-aio/playbooks/host_vars/logging1.yml b/multi-node-aio/playbooks/host_vars/logging1.yml
index 2c804f75..b6db9a82 100644
--- a/multi-node-aio/playbooks/host_vars/logging1.yml
+++ b/multi-node-aio/playbooks/host_vars/logging1.yml
@@ -13,20 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
-
 server_hostname: 'logging1'
-server_domain_name: 'openstack.local'
-server_vm: true
-server_vm_ram: '{{ logging_vm_server_ram | default(1024) }}'
-server_vm_vcpus: '{{ logging_vm_server_vcpus | default(2) }}'
 server_vm_fixed_addr: '10.0.2.110'
-server_vm_primary_network: 'dhcp'
-server_image: "{{ default_vm_image }}"
-server_default_interface: 'eth0'
 server_mac_address: '52:54:00:bd:80:03'
-server_preseed_ks: 'vm'
-server_extra_options: ''
 
 server_networks:
   dhcp:
diff --git a/multi-node-aio/playbooks/host_vars/swift1.yml b/multi-node-aio/playbooks/host_vars/swift1.yml
index 48690527..f7c710d9 100644
--- a/multi-node-aio/playbooks/host_vars/swift1.yml
+++ b/multi-node-aio/playbooks/host_vars/swift1.yml
@@ -13,20 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
-
 server_hostname: 'swift1'
-server_domain_name: 'openstack.local'
-server_vm: true
-server_vm_ram: '{{ swift_vm_server_ram | default(1024) }}'
-server_vm_vcpus: '{{ swift_vm_server_vcpus | default(2) }}'
 server_vm_fixed_addr: '10.0.2.140'
-server_vm_primary_network: 'dhcp'
-server_image: "{{ default_vm_image }}"
-server_default_interface: 'eth0'
 server_mac_address: '52:54:00:bd:80:09'
-server_preseed_ks: 'vm'
-server_extra_options: ''
 
 server_networks:
   dhcp:
diff --git a/multi-node-aio/playbooks/host_vars/swift2.yml b/multi-node-aio/playbooks/host_vars/swift2.yml
index e9f80fde..d1ba1e73 100644
--- a/multi-node-aio/playbooks/host_vars/swift2.yml
+++ b/multi-node-aio/playbooks/host_vars/swift2.yml
@@ -13,20 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
-
 server_hostname: 'swift2'
-server_domain_name: 'openstack.local'
-server_vm: true
-server_vm_ram: '{{ swift_vm_server_ram | default(1024) }}'
-server_vm_vcpus: '{{ swift_vm_server_vcpus | default(2) }}'
 server_vm_fixed_addr: '10.0.2.141'
-server_vm_primary_network: 'dhcp'
-server_image: "{{ default_vm_image }}"
-server_default_interface: 'eth0'
 server_mac_address: '52:54:00:bd:80:10'
-server_preseed_ks: 'vm'
-server_extra_options: ''
 
 server_networks:
   dhcp:
diff --git a/multi-node-aio/playbooks/host_vars/swift3.yml b/multi-node-aio/playbooks/host_vars/swift3.yml
index 46fd951c..45684b26 100644
--- a/multi-node-aio/playbooks/host_vars/swift3.yml
+++ b/multi-node-aio/playbooks/host_vars/swift3.yml
@@ -13,20 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ansible_os_family: "{{ images[default_vm_image]['image_type'] }}"
-
 server_hostname: 'swift3'
-server_domain_name: 'openstack.local'
-server_vm: true
-server_vm_ram: '{{ swift_vm_server_ram | default(1024) }}'
-server_vm_vcpus: '{{ swift_vm_server_vcpus | default(2) }}'
 server_vm_fixed_addr: '10.0.2.142'
-server_vm_primary_network: 'dhcp'
-server_image: "{{ default_vm_image }}"
-server_default_interface: 'eth0'
 server_mac_address: '52:54:00:bd:80:11'
-server_preseed_ks: 'vm'
-server_extra_options: ''
 
 server_networks:
   dhcp: