diff --git a/bootstrap/build-image.yml b/bootstrap/build-image.yaml
similarity index 100%
rename from bootstrap/build-image.yml
rename to bootstrap/build-image.yaml
diff --git a/bootstrap/packer.yml b/bootstrap/packer.yaml
similarity index 100%
rename from bootstrap/packer.yml
rename to bootstrap/packer.yaml
diff --git a/bootstrap/playbooks/build-main.yml b/bootstrap/playbooks/build-main.yaml
similarity index 100%
rename from bootstrap/playbooks/build-main.yml
rename to bootstrap/playbooks/build-main.yaml
diff --git a/bootstrap/playbooks/celery.yml b/bootstrap/playbooks/celery.yaml
similarity index 100%
rename from bootstrap/playbooks/celery.yml
rename to bootstrap/playbooks/celery.yaml
diff --git a/bootstrap/playbooks/custom-configs.yml b/bootstrap/playbooks/custom-configs.yaml
similarity index 100%
rename from bootstrap/playbooks/custom-configs.yml
rename to bootstrap/playbooks/custom-configs.yaml
diff --git a/bootstrap/playbooks/solar.yml b/bootstrap/playbooks/solar.yaml
similarity index 100%
rename from bootstrap/playbooks/solar.yml
rename to bootstrap/playbooks/solar.yaml
diff --git a/bootstrap/playbooks/tasks/base.yml b/bootstrap/playbooks/tasks/base.yaml
similarity index 100%
rename from bootstrap/playbooks/tasks/base.yml
rename to bootstrap/playbooks/tasks/base.yaml
diff --git a/bootstrap/playbooks/tasks/cloud_archive.yml b/bootstrap/playbooks/tasks/cloud_archive.yaml
similarity index 100%
rename from bootstrap/playbooks/tasks/cloud_archive.yml
rename to bootstrap/playbooks/tasks/cloud_archive.yaml
diff --git a/bootstrap/playbooks/tasks/docker.yml b/bootstrap/playbooks/tasks/docker.yaml
similarity index 100%
rename from bootstrap/playbooks/tasks/docker.yml
rename to bootstrap/playbooks/tasks/docker.yaml
diff --git a/bootstrap/playbooks/tasks/puppet.yml b/bootstrap/playbooks/tasks/puppet.yaml
similarity index 100%
rename from bootstrap/playbooks/tasks/puppet.yml
rename to bootstrap/playbooks/tasks/puppet.yaml
diff --git a/resources/ansible_local/actions/test_role/defaults/main.yml b/resources/ansible_local/actions/test_role/defaults/main.yaml
similarity index 100%
rename from resources/ansible_local/actions/test_role/defaults/main.yml
rename to resources/ansible_local/actions/test_role/defaults/main.yaml
diff --git a/resources/ansible_local/actions/test_role/tasks/main.yml b/resources/ansible_local/actions/test_role/tasks/main.yaml
similarity index 100%
rename from resources/ansible_local/actions/test_role/tasks/main.yml
rename to resources/ansible_local/actions/test_role/tasks/main.yaml
diff --git a/resources/container_networks/actions/run.yml b/resources/container_networks/actions/run.yaml
similarity index 100%
rename from resources/container_networks/actions/run.yml
rename to resources/container_networks/actions/run.yaml
diff --git a/resources/data_container/actions/echo.yml b/resources/data_container/actions/echo.yaml
similarity index 100%
rename from resources/data_container/actions/echo.yml
rename to resources/data_container/actions/echo.yaml
diff --git a/resources/data_container/actions/remove.yml b/resources/data_container/actions/remove.yaml
similarity index 100%
rename from resources/data_container/actions/remove.yml
rename to resources/data_container/actions/remove.yaml
diff --git a/resources/data_container/actions/run.yml b/resources/data_container/actions/run.yaml
similarity index 100%
rename from resources/data_container/actions/run.yml
rename to resources/data_container/actions/run.yaml
diff --git a/resources/docker/actions/run.yml b/resources/docker/actions/run.yaml
similarity index 100%
rename from resources/docker/actions/run.yml
rename to resources/docker/actions/run.yaml
diff --git a/resources/docker_container/actions/remove.yml b/resources/docker_container/actions/remove.yaml
similarity index 100%
rename from resources/docker_container/actions/remove.yml
rename to resources/docker_container/actions/remove.yaml
diff --git a/resources/docker_container/actions/run.yml b/resources/docker_container/actions/run.yaml
similarity index 100%
rename from resources/docker_container/actions/run.yml
rename to resources/docker_container/actions/run.yaml
diff --git a/resources/glance_api_service/actions/remove.yml b/resources/glance_api_service/actions/remove.yaml
similarity index 100%
rename from resources/glance_api_service/actions/remove.yml
rename to resources/glance_api_service/actions/remove.yaml
diff --git a/resources/glance_api_service/actions/run.yml b/resources/glance_api_service/actions/run.yaml
similarity index 100%
rename from resources/glance_api_service/actions/run.yml
rename to resources/glance_api_service/actions/run.yaml
diff --git a/resources/glance_config/actions/remove.yml b/resources/glance_config/actions/remove.yaml
similarity index 100%
rename from resources/glance_config/actions/remove.yml
rename to resources/glance_config/actions/remove.yaml
diff --git a/resources/glance_config/actions/run.yml b/resources/glance_config/actions/run.yaml
similarity index 100%
rename from resources/glance_config/actions/run.yml
rename to resources/glance_config/actions/run.yaml
diff --git a/resources/glance_registry_service/actions/remove.yml b/resources/glance_registry_service/actions/remove.yaml
similarity index 100%
rename from resources/glance_registry_service/actions/remove.yml
rename to resources/glance_registry_service/actions/remove.yaml
diff --git a/resources/glance_registry_service/actions/run.yml b/resources/glance_registry_service/actions/run.yaml
similarity index 100%
rename from resources/glance_registry_service/actions/run.yml
rename to resources/glance_registry_service/actions/run.yaml
diff --git a/resources/haproxy_config/actions/remove.yml b/resources/haproxy_config/actions/remove.yaml
similarity index 100%
rename from resources/haproxy_config/actions/remove.yml
rename to resources/haproxy_config/actions/remove.yaml
diff --git a/resources/haproxy_config/actions/run.yml b/resources/haproxy_config/actions/run.yaml
similarity index 100%
rename from resources/haproxy_config/actions/run.yml
rename to resources/haproxy_config/actions/run.yaml
diff --git a/resources/haproxy_config/actions/update.yml b/resources/haproxy_config/actions/update.yaml
similarity index 100%
rename from resources/haproxy_config/actions/update.yml
rename to resources/haproxy_config/actions/update.yaml
diff --git a/resources/haproxy_service/actions/apply_config.yml b/resources/haproxy_service/actions/apply_config.yaml
similarity index 100%
rename from resources/haproxy_service/actions/apply_config.yml
rename to resources/haproxy_service/actions/apply_config.yaml
diff --git a/resources/haproxy_service/actions/install.yml b/resources/haproxy_service/actions/install.yaml
similarity index 100%
rename from resources/haproxy_service/actions/install.yml
rename to resources/haproxy_service/actions/install.yaml
diff --git a/resources/haproxy_service/actions/remove.yml b/resources/haproxy_service/actions/remove.yaml
similarity index 100%
rename from resources/haproxy_service/actions/remove.yml
rename to resources/haproxy_service/actions/remove.yaml
diff --git a/resources/haproxy_service/actions/run.yml b/resources/haproxy_service/actions/run.yaml
similarity index 100%
rename from resources/haproxy_service/actions/run.yml
rename to resources/haproxy_service/actions/run.yaml
diff --git a/resources/haproxy_service/actions/update.yml b/resources/haproxy_service/actions/update.yaml
similarity index 100%
rename from resources/haproxy_service/actions/update.yml
rename to resources/haproxy_service/actions/update.yaml
diff --git a/resources/hosts_file/actions/run.yml b/resources/hosts_file/actions/run.yaml
similarity index 100%
rename from resources/hosts_file/actions/run.yml
rename to resources/hosts_file/actions/run.yaml
diff --git a/resources/keystone_config/actions/remove.yml b/resources/keystone_config/actions/remove.yaml
similarity index 100%
rename from resources/keystone_config/actions/remove.yml
rename to resources/keystone_config/actions/remove.yaml
diff --git a/resources/keystone_config/actions/run.yml b/resources/keystone_config/actions/run.yaml
similarity index 100%
rename from resources/keystone_config/actions/run.yml
rename to resources/keystone_config/actions/run.yaml
diff --git a/resources/keystone_role/actions/remove.yml b/resources/keystone_role/actions/remove.yaml
similarity index 100%
rename from resources/keystone_role/actions/remove.yml
rename to resources/keystone_role/actions/remove.yaml
diff --git a/resources/keystone_role/actions/run.yml b/resources/keystone_role/actions/run.yaml
similarity index 100%
rename from resources/keystone_role/actions/run.yml
rename to resources/keystone_role/actions/run.yaml
diff --git a/resources/keystone_service/actions/remove.yml b/resources/keystone_service/actions/remove.yaml
similarity index 100%
rename from resources/keystone_service/actions/remove.yml
rename to resources/keystone_service/actions/remove.yaml
diff --git a/resources/keystone_service/actions/run.yml b/resources/keystone_service/actions/run.yaml
similarity index 100%
rename from resources/keystone_service/actions/run.yml
rename to resources/keystone_service/actions/run.yaml
diff --git a/resources/keystone_tenant/actions/remove.yml b/resources/keystone_tenant/actions/remove.yaml
similarity index 100%
rename from resources/keystone_tenant/actions/remove.yml
rename to resources/keystone_tenant/actions/remove.yaml
diff --git a/resources/keystone_tenant/actions/run.yml b/resources/keystone_tenant/actions/run.yaml
similarity index 100%
rename from resources/keystone_tenant/actions/run.yml
rename to resources/keystone_tenant/actions/run.yaml
diff --git a/resources/keystone_user/actions/remove.yml b/resources/keystone_user/actions/remove.yaml
similarity index 100%
rename from resources/keystone_user/actions/remove.yml
rename to resources/keystone_user/actions/remove.yaml
diff --git a/resources/keystone_user/actions/run.yml b/resources/keystone_user/actions/run.yaml
similarity index 100%
rename from resources/keystone_user/actions/run.yml
rename to resources/keystone_user/actions/run.yaml
diff --git a/resources/lxc_container/actions/run.yml b/resources/lxc_container/actions/run.yaml
similarity index 100%
rename from resources/lxc_container/actions/run.yml
rename to resources/lxc_container/actions/run.yaml
diff --git a/resources/lxc_host/actions/run.yml b/resources/lxc_host/actions/run.yaml
similarity index 100%
rename from resources/lxc_host/actions/run.yml
rename to resources/lxc_host/actions/run.yaml
diff --git a/resources/mariadb_db/actions/remove.yml b/resources/mariadb_db/actions/remove.yaml
similarity index 100%
rename from resources/mariadb_db/actions/remove.yml
rename to resources/mariadb_db/actions/remove.yaml
diff --git a/resources/mariadb_db/actions/run.yml b/resources/mariadb_db/actions/run.yaml
similarity index 100%
rename from resources/mariadb_db/actions/run.yml
rename to resources/mariadb_db/actions/run.yaml
diff --git a/resources/mariadb_service/actions/remove.yml b/resources/mariadb_service/actions/remove.yaml
similarity index 100%
rename from resources/mariadb_service/actions/remove.yml
rename to resources/mariadb_service/actions/remove.yaml
diff --git a/resources/mariadb_service/actions/run.yml b/resources/mariadb_service/actions/run.yaml
similarity index 100%
rename from resources/mariadb_service/actions/run.yml
rename to resources/mariadb_service/actions/run.yaml
diff --git a/resources/mariadb_user/actions/remove.yml b/resources/mariadb_user/actions/remove.yaml
similarity index 100%
rename from resources/mariadb_user/actions/remove.yml
rename to resources/mariadb_user/actions/remove.yaml
diff --git a/resources/mariadb_user/actions/run.yml b/resources/mariadb_user/actions/run.yaml
similarity index 100%
rename from resources/mariadb_user/actions/run.yml
rename to resources/mariadb_user/actions/run.yaml
diff --git a/resources/rabbitmq_config/actions/remove.yml b/resources/rabbitmq_config/actions/remove.yaml
similarity index 100%
rename from resources/rabbitmq_config/actions/remove.yml
rename to resources/rabbitmq_config/actions/remove.yaml
diff --git a/resources/rabbitmq_config/actions/run.yml b/resources/rabbitmq_config/actions/run.yaml
similarity index 100%
rename from resources/rabbitmq_config/actions/run.yml
rename to resources/rabbitmq_config/actions/run.yaml
diff --git a/resources/rabbitmq_user/actions/remove.yml b/resources/rabbitmq_user/actions/remove.yaml
similarity index 100%
rename from resources/rabbitmq_user/actions/remove.yml
rename to resources/rabbitmq_user/actions/remove.yaml
diff --git a/resources/rabbitmq_user/actions/run.yml b/resources/rabbitmq_user/actions/run.yaml
similarity index 100%
rename from resources/rabbitmq_user/actions/run.yml
rename to resources/rabbitmq_user/actions/run.yaml
diff --git a/resources/rabbitmq_vhost/actions/remove.yml b/resources/rabbitmq_vhost/actions/remove.yaml
similarity index 100%
rename from resources/rabbitmq_vhost/actions/remove.yml
rename to resources/rabbitmq_vhost/actions/remove.yaml
diff --git a/resources/rabbitmq_vhost/actions/run.yml b/resources/rabbitmq_vhost/actions/run.yaml
similarity index 100%
rename from resources/rabbitmq_vhost/actions/run.yml
rename to resources/rabbitmq_vhost/actions/run.yaml
diff --git a/resources/riak_join_single/actions/join.yml b/resources/riak_join_single/actions/join.yaml
similarity index 100%
rename from resources/riak_join_single/actions/join.yml
rename to resources/riak_join_single/actions/join.yaml
diff --git a/resources/riak_node/actions/commit.yml b/resources/riak_node/actions/commit.yaml
similarity index 100%
rename from resources/riak_node/actions/commit.yml
rename to resources/riak_node/actions/commit.yaml
diff --git a/resources/riak_node/actions/join.yml b/resources/riak_node/actions/join.yaml
similarity index 100%
rename from resources/riak_node/actions/join.yml
rename to resources/riak_node/actions/join.yaml
diff --git a/resources/riak_node/actions/remove.yml b/resources/riak_node/actions/remove.yaml
similarity index 100%
rename from resources/riak_node/actions/remove.yml
rename to resources/riak_node/actions/remove.yaml
diff --git a/resources/riak_node/actions/run.yml b/resources/riak_node/actions/run.yaml
similarity index 100%
rename from resources/riak_node/actions/run.yml
rename to resources/riak_node/actions/run.yaml
diff --git a/resources/riak_node/actions/update.yml b/resources/riak_node/actions/update.yaml
similarity index 100%
rename from resources/riak_node/actions/update.yml
rename to resources/riak_node/actions/update.yaml
diff --git a/resources/ssh_key/actions/run.yml b/resources/ssh_key/actions/run.yaml
similarity index 100%
rename from resources/ssh_key/actions/run.yml
rename to resources/ssh_key/actions/run.yaml
diff --git a/resources/vxlan_mesh/actions/run.yml b/resources/vxlan_mesh/actions/run.yaml
similarity index 100%
rename from resources/vxlan_mesh/actions/run.yml
rename to resources/vxlan_mesh/actions/run.yaml
diff --git a/solar/solar/test/orch_fixtures/example_py.yml b/solar/solar/test/orch_fixtures/example_py.yaml
similarity index 100%
rename from solar/solar/test/orch_fixtures/example_py.yml
rename to solar/solar/test/orch_fixtures/example_py.yaml
diff --git a/solar/solar/test/orch_fixtures/riak.yml b/solar/solar/test/orch_fixtures/riak.yaml
similarity index 100%
rename from solar/solar/test/orch_fixtures/riak.yml
rename to solar/solar/test/orch_fixtures/riak.yaml
diff --git a/solar/solar/test/orch_fixtures/sequential.yml b/solar/solar/test/orch_fixtures/sequential.yaml
similarity index 100%
rename from solar/solar/test/orch_fixtures/sequential.yml
rename to solar/solar/test/orch_fixtures/sequential.yaml
diff --git a/solar/solar/test/orch_fixtures/test_errors.yml b/solar/solar/test/orch_fixtures/test_errors.yaml
similarity index 100%
rename from solar/solar/test/orch_fixtures/test_errors.yml
rename to solar/solar/test/orch_fixtures/test_errors.yaml
diff --git a/solar/solar/test/orch_fixtures/two_path.yml b/solar/solar/test/orch_fixtures/two_path.yaml
similarity index 100%
rename from solar/solar/test/orch_fixtures/two_path.yml
rename to solar/solar/test/orch_fixtures/two_path.yaml
diff --git a/solar/solar/test/orch_fixtures/upd_test_errors.yml b/solar/solar/test/orch_fixtures/upd_test_errors.yaml
similarity index 100%
rename from solar/solar/test/orch_fixtures/upd_test_errors.yml
rename to solar/solar/test/orch_fixtures/upd_test_errors.yaml
diff --git a/templates/controller.yml b/templates/controller.yaml
similarity index 100%
rename from templates/controller.yml
rename to templates/controller.yaml
diff --git a/templates/glance.yml b/templates/glance.yaml
similarity index 100%
rename from templates/glance.yml
rename to templates/glance.yaml
diff --git a/templates/glance_base.yml b/templates/glance_base.yaml
similarity index 100%
rename from templates/glance_base.yml
rename to templates/glance_base.yaml
diff --git a/templates/glance_db.yml b/templates/glance_db.yaml
similarity index 100%
rename from templates/glance_db.yml
rename to templates/glance_db.yaml
diff --git a/templates/glance_registry.yml b/templates/glance_registry.yaml
similarity index 100%
rename from templates/glance_registry.yml
rename to templates/glance_registry.yaml
diff --git a/templates/keystone_api.yml b/templates/keystone_api.yaml
similarity index 100%
rename from templates/keystone_api.yml
rename to templates/keystone_api.yaml
diff --git a/templates/keystone_base.yml b/templates/keystone_base.yaml
similarity index 100%
rename from templates/keystone_base.yml
rename to templates/keystone_base.yaml
diff --git a/templates/nodes.yml b/templates/nodes.yaml
similarity index 100%
rename from templates/nodes.yml
rename to templates/nodes.yaml
diff --git a/templates/openstack_base.yml b/templates/openstack_base.yaml
similarity index 100%
rename from templates/openstack_base.yml
rename to templates/openstack_base.yaml
diff --git a/templates/profile.yml b/templates/profile.yaml
similarity index 100%
rename from templates/profile.yml
rename to templates/profile.yaml
diff --git a/templates/riak_nodes.yml b/templates/riak_nodes.yaml
similarity index 100%
rename from templates/riak_nodes.yml
rename to templates/riak_nodes.yaml
diff --git a/templates/seed_node.yml b/templates/seed_node.yaml
similarity index 100%
rename from templates/seed_node.yml
rename to templates/seed_node.yaml
diff --git a/vagrant-settings.yaml b/vagrant-settings.yaml
new file mode 100644
index 00000000..43572021
--- /dev/null
+++ b/vagrant-settings.yaml
@@ -0,0 +1,2 @@
+slaves_count: 3
+slaves_ram: 2048