diff --git a/README.md b/README.md index d3cafaf9..f21d82f9 100644 --- a/README.md +++ b/README.md @@ -242,7 +242,7 @@ functional way, and in particular avoid `for` loops. Here's an example: ```python from solar import template -nodes = template.nodes_from('templates/riak_nodes.yml') +nodes = template.nodes_from('templates/riak_nodes.yaml') riak_services = nodes.on_each( 'resources/riak_node', diff --git a/Vagrantfile b/Vagrantfile index 42d4aebd..908e60fd 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -20,9 +20,9 @@ require 'yaml' VAGRANTFILE_API_VERSION = "2" # configs, custom updates _defaults -defaults_cfg = YAML.load_file('vagrant-settings.yml_defaults') -if File.exist?('vagrant-settings.yml') - custom_cfg = YAML.load_file('vagrant-settings.yml') +defaults_cfg = YAML.load_file('vagrant-settings.yaml_defaults') +if File.exist?('vagrant-settings.yaml') + custom_cfg = YAML.load_file('vagrant-settings.yaml') cfg = defaults_cfg.merge(custom_cfg) else cfg = defaults_cfg @@ -36,13 +36,13 @@ def ansible_playbook_command(filename, args=[]) "ansible-playbook -v -i \"localhost,\" -c local /vagrant/bootstrap/playbooks/#{filename} #{args.join ' '}" end -solar_script = ansible_playbook_command("solar.yml") +solar_script = ansible_playbook_command("solar.yaml") -slave_script = ansible_playbook_command("custom-configs.yml", ["-e", "master_ip=10.0.0.2"]) +slave_script = ansible_playbook_command("custom-configs.yaml", ["-e", "master_ip=10.0.0.2"]) -master_celery = ansible_playbook_command("celery.yml", ["--skip-tags", "slave"]) +master_celery = ansible_playbook_command("celery.yaml", ["--skip-tags", "slave"]) -slave_celery = ansible_playbook_command("celery.yml", ["--skip-tags", "master"]) +slave_celery = ansible_playbook_command("celery.yaml", ["--skip-tags", "master"]) Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| 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.yaml b/bootstrap/playbooks/build-main.yaml new file mode 100644 index 00000000..76f32f5f --- /dev/null +++ b/bootstrap/playbooks/build-main.yaml @@ -0,0 +1,11 @@ +--- + +- name: Main build script + hosts: all + sudo: yes + tasks: + - include: tasks/base.yaml + - include: tasks/puppet.yaml + - include: tasks/docker.yaml + #- include: celery.yaml tags=['master'] celery_dir=/var/run/celery + - include: tasks/cloud_archive.yaml diff --git a/bootstrap/playbooks/build-main.yml b/bootstrap/playbooks/build-main.yml deleted file mode 100644 index 479d6494..00000000 --- a/bootstrap/playbooks/build-main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- - -- name: Main build script - hosts: all - sudo: yes - tasks: - - include: tasks/base.yml - - include: tasks/puppet.yml - - include: tasks/docker.yml - #- include: celery.yml tags=['master'] celery_dir=/var/run/celery - - include: tasks/cloud_archive.yml 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/bootstrap/solar-master.json b/bootstrap/solar-master.json index 6d8a82d2..f3f531fa 100644 --- a/bootstrap/solar-master.json +++ b/bootstrap/solar-master.json @@ -39,7 +39,7 @@ }, { "type": "ansible-local", "playbook_dir": "playbooks", - "playbook_file": "playbooks/build-main.yml", + "playbook_file": "playbooks/build-main.yaml", "extra_arguments": ["--verbose"] }], "post-processors": [{ diff --git a/examples/lxc/example-lxc.py b/examples/lxc/example-lxc.py index b9bb734d..1c898ca9 100644 --- a/examples/lxc/example-lxc.py +++ b/examples/lxc/example-lxc.py @@ -47,8 +47,8 @@ def deploy(): db.clear() signals.Connections.clear() - node1 = vr.create('nodes', 'templates/nodes.yml', {})[0] - seed = vr.create('nodes', 'templates/seed_node.yml', {})[0] + node1 = vr.create('nodes', 'templates/nodes.yaml', {})[0] + seed = vr.create('nodes', 'templates/seed_node.yaml', {})[0] ssh_key = vr.create('ssh_key1', 'resources/ssh_key', { 'keys_dir': '/vagrant/.ssh', diff --git a/examples/openstack/openstack.py b/examples/openstack/openstack.py index b9c1278d..6c15b0d0 100755 --- a/examples/openstack/openstack.py +++ b/examples/openstack/openstack.py @@ -54,7 +54,7 @@ def setup_resources(): if PROFILE: pr.enable() - node1, node2 = vr.create('nodes', 'templates/nodes.yml', {}) + node1, node2 = vr.create('nodes', 'templates/nodes.yaml', {}) # MARIADB mariadb_service1 = vr.create('mariadb_service1', 'resources/mariadb_service', { diff --git a/examples/riak/riaks-template.py b/examples/riak/riaks-template.py index bf643922..751f9832 100644 --- a/examples/riak/riaks-template.py +++ b/examples/riak/riaks-template.py @@ -14,7 +14,7 @@ signals.Connections.clear() from solar import template -nodes = template.nodes_from('templates/riak_nodes.yml') +nodes = template.nodes_from('templates/riak_nodes.yaml') riak_services = nodes.on_each( 'resources/riak_node', diff --git a/examples/riak/riaks.py b/examples/riak/riaks.py index 4288ad6f..469ad1ef 100644 --- a/examples/riak/riaks.py +++ b/examples/riak/riaks.py @@ -27,7 +27,7 @@ db = get_db() def setup_riak(): db.clear() - nodes = vr.create('nodes', 'templates/riak_nodes.yml', {}) + nodes = vr.create('nodes', 'templates/riak_nodes.yaml', {}) node1, node2, node3 = nodes riak_services = [] 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_db/meta.yaml b/resources/mariadb_db/meta.yaml index f5333761..f2dd9623 100644 --- a/resources/mariadb_db/meta.yaml +++ b/resources/mariadb_db/meta.yaml @@ -2,8 +2,8 @@ id: mariadb_db handler: ansible version: 1.0.0 actions: - run: run.yml - remove: remove.yml + run: run.yaml + remove: remove.yaml input: db_name: schema: str! 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/mariadb_user/meta.yaml b/resources/mariadb_user/meta.yaml index 6aed07c2..ff7a5844 100644 --- a/resources/mariadb_user/meta.yaml +++ b/resources/mariadb_user/meta.yaml @@ -2,8 +2,8 @@ id: mariadb_user handler: ansible version: 1.0.0 actions: - run: run.yml - remove: remove.yml + run: run.yaml + remove: remove.yaml input: user_password: schema: str! 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_join_single/meta.yaml b/resources/riak_join_single/meta.yaml index f9d65034..76f2df83 100644 --- a/resources/riak_join_single/meta.yaml +++ b/resources/riak_join_single/meta.yaml @@ -2,7 +2,7 @@ id: riak_join_single handler: ansible version: 1.0.0 actions: - join: actions/join.yml + join: actions/join.yaml input: join_to: schema: str! 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/riak_node/meta.yaml b/resources/riak_node/meta.yaml index 22963c96..e5a8a0d0 100644 --- a/resources/riak_node/meta.yaml +++ b/resources/riak_node/meta.yaml @@ -2,9 +2,9 @@ id: riak_node handler: ansible version: 1.0.0 actions: - commit: actions/commit.yml - run: actions/run.yml - join: actions/join.yml + commit: actions/commit.yaml + run: actions/run.yaml + join: actions/join.yaml input: ip: schema: str! diff --git a/resources/solar_bootstrap/actions/run.yaml b/resources/solar_bootstrap/actions/run.yaml index 9dcaf1a4..89bcfb3d 100644 --- a/resources/solar_bootstrap/actions/run.yaml +++ b/resources/solar_bootstrap/actions/run.yaml @@ -5,7 +5,7 @@ sudo: yes tasks: - script: /vagrant/bootstrap/playbooks/files/ubuntu-ansible.sh -#- include: celery.yml tags=['master'] celery_dir=/var/run/celery -- include: /vagrant/bootstrap/playbooks/build-main.yml -- include: /vagrant/bootstrap/playbooks/custom-configs.yml master_ip={{ master_ip }} -- include: /vagrant/bootstrap/playbooks/celery.yml tags=slave +#- include: celery.yaml tags=['master'] celery_dir=/var/run/celery +- include: /vagrant/bootstrap/playbooks/build-main.yaml +- include: /vagrant/bootstrap/playbooks/custom-configs.yaml master_ip={{ master_ip }} +- include: /vagrant/bootstrap/playbooks/celery.yaml tags=slave 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/solar/solar/test/test_graph_filtering.py b/solar/solar/test/test_graph_filtering.py index 354fe144..0fc494bc 100644 --- a/solar/solar/test/test_graph_filtering.py +++ b/solar/solar/test/test_graph_filtering.py @@ -63,7 +63,7 @@ def riak_plan(): riak_path = os.path.join( os.path.dirname(os.path.realpath(__file__)), 'orch_fixtures', - 'riak.yml') + 'riak.yaml') return graph.create_plan(riak_path, save=False) diff --git a/solar/solar/test/test_limits.py b/solar/solar/test/test_limits.py index bcd005cb..b4668e91 100644 --- a/solar/solar/test/test_limits.py +++ b/solar/solar/test/test_limits.py @@ -70,7 +70,7 @@ def seq_plan(): seq_path = os.path.join( os.path.dirname(os.path.realpath(__file__)), 'orch_fixtures', - 'sequential.yml') + 'sequential.yaml') return graph.create_plan(seq_path, save=False) diff --git a/solar/solar/utils.py b/solar/solar/utils.py index b03b12bd..848c7423 100644 --- a/solar/solar/utils.py +++ b/solar/solar/utils.py @@ -80,7 +80,7 @@ def ext_encoder(fpath): ext = os.path.splitext(os.path.basename(fpath))[1].strip('.') if ext in ['json']: return json - elif ext in ['yaml', 'yml']: + elif ext in ['yaml', 'yaml']: return yaml raise Exception('Unknown extension {}'.format(ext)) diff --git a/templates/controller.yml b/templates/controller.yaml similarity index 94% rename from templates/controller.yml rename to templates/controller.yaml index 46ff41fd..24feb761 100644 --- a/templates/controller.yml +++ b/templates/controller.yaml @@ -19,7 +19,7 @@ resources: ssh_key: '{{ssh_key}}' - id: keystone_base - from: templates/keystone_base.yml + from: templates/keystone_base.yaml values: login_user: root login_password: 'mariadb_service::root_password' @@ -33,7 +33,7 @@ resources: ssh_key: '{{ssh_key}}' - id: keystone_api_1 - from: templates/keystone_api.yml + from: templates/keystone_api.yaml values: idx: 1 db_password: 'keystone_db_user::user_password' @@ -49,7 +49,7 @@ resources: ssh_key: '{{ssh_key}}' - id: openstack_base - from: templates/openstack_base.yml + from: templates/openstack_base.yaml values: ip: '{{ip}}' ssh_user: '{{ssh_user}}' diff --git a/templates/glance.yml b/templates/glance.yaml similarity index 93% rename from templates/glance.yml rename to templates/glance.yaml index e494f927..72705af9 100644 --- a/templates/glance.yml +++ b/templates/glance.yaml @@ -2,7 +2,7 @@ id: glance_{{idx}} resources: - id: glance_base_{{ idx }} - from: templates/glance_db.yml + from: templates/glance_db.yaml values: idx: '{{ idx }}' 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 diff --git a/vagrant-settings.yml_defaults b/vagrant-settings.yaml_defaults similarity index 60% rename from vagrant-settings.yml_defaults rename to vagrant-settings.yaml_defaults index b727c0b7..af415d95 100644 --- a/vagrant-settings.yml_defaults +++ b/vagrant-settings.yaml_defaults @@ -1,4 +1,4 @@ -# rename it to vagrant-settings.yml then Vagrantfile +# rename it to vagrant-settings.yaml then Vagrantfile # will use values from this file slaves_count: 2