x/solar
Code Issues Proposed changes

changed all yml occurrences to yaml

Browse Source
This commit is contained in:
Jedrzej Nowak 2015-09-15 12:24:34 +02:00
parent 65fe388ab8
commit ecfb5b10e2
19 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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',

14
Vagrantfile vendored
View File

@ -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|

10
bootstrap/playbooks/build-main.yaml
View File

@ -4,8 +4,8 @@
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
- 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

2
bootstrap/solar-master.json
View File

@ -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": [{

4
examples/lxc/example-lxc.py
View File

@ -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',

2
examples/openstack/openstack.py
View File

@ -41,7 +41,7 @@ def setup_resources():
signals.Connections.clear()
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', {

2
examples/riak/riaks-template.py
View File

@ -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',

2
examples/riak/riaks.py
View File

@ -28,7 +28,7 @@ def setup_riak():
db.clear()
signals.Connections.clear()
nodes = vr.create('nodes', 'templates/riak_nodes.yml', {})
nodes = vr.create('nodes', 'templates/riak_nodes.yaml', {})
node1, node2, node3 = nodes
riak_services = []

4
resources/mariadb_db/meta.yaml
View File

@ -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!

4
resources/mariadb_user/meta.yaml
View File

@ -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!

2
resources/riak_join_single/meta.yaml
View File

@ -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!

6
resources/riak_node/meta.yaml
View File

@ -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!

8
resources/solar_bootstrap/actions/run.yaml
View File

@ -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

2
solar/solar/test/test_graph_filtering.py
View File

@ -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)

2
solar/solar/test/test_limits.py
View File

@ -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)

2
solar/solar/utils.py
View File

@ -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))

6
templates/controller.yaml
View File

@ -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}}'

2
templates/glance.yaml
View File

@ -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 }}'

2
vagrant-settings.yml_defaults
View File

@ -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