x/solar-resources
Code Issues Proposed changes

Validation fixes

Browse Source
This commit is contained in:
Przemyslaw Kaminski 2015-05-27 17:06:19 +02:00
parent 6d64a43437
commit f25864cbf9
8 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/data_container/actions/run.yml
View File

@ -6,10 +6,13 @@
image: {{ image }}
state: running
net: host
{% if ports.value %}
ports:
{% for port in ports.value %}
- {{ port['value'] }}:{{ port['value'] }}
{% endfor %}
{% endif %}
{% if host_binds.value %}
volumes:
# TODO: host_binds might need more work
# Currently it's not that trivial to pass custom src: dst here
@ -17,4 +20,5 @@
# so we mount it to the same directory as on host
{% for bind in host_binds.value %}
- {{ bind['value']['src'] }}:{{ bind['value']['dst'] }}:{{ bind['value'].get('mode', 'ro') }}
{% endfor %}
{% endfor %}
{% endif %}

4
resources/docker_container/actions/run.yml
View File

@ -7,12 +7,15 @@
image: {{ image }}
state: running
net: host
{% if ports.value %}
ports:
{% for port in ports.value %}
{% for p in port['value'] %}
- {{ p['value'] }}:{{ p['value'] }}
{% endfor %}
{% endfor %}
{% endif %}
{% if host_binds.value %}
volumes:
# TODO: host_binds might need more work
# Currently it's not that trivial to pass custom src: dst here
@ -21,3 +24,4 @@
{% for bind in host_binds.value %}
- {{ bind['value']['src'] }}:{{ bind['value']['dst'] }}:{{ bind['value'].get('mode', 'ro') }}
{% endfor %}
{% endif %}

4
resources/docker_container/meta.yaml
View File

@ -9,10 +9,10 @@ input:
schema: str!
value:
ports:
schema: [int]
schema: [{value: [{value: int}]}]
value: []
host_binds:
schema: [[int]]
schema: [{value: {src: str, dst: str}}]
value: []
volume_binds:
schema: [{src: str, dst: str}]

10
resources/haproxy/meta.yaml
View File

@ -3,22 +3,22 @@ handler: ansible
version: 1.0.0
input:
ip:
schema: int!
schema: str!
value:
config_dir:
schema: {src: str!, dst: str!}
value: {src: /etc/solar/haproxy, dst: /etc/haproxy}
listen_ports:
schema: [int]
schema: [{value: int}]
value: []
configs:
schema: [[str]]
schema: [{value: [{value: str}]}]
value: []
configs_names:
schema: [str]
schema: [{value: str}]
value: []
configs_ports:
schema: [[int]]
schema: [{value: [{value: int}]}]
value: []
ssh_user:
schema: str!

4
resources/haproxy_keystone_config/meta.yaml
View File

@ -9,10 +9,10 @@ input:
schema: int!
value: 9999
ports:
schema: [int]
schema: [{value: int}]
value:
servers:
schema: [str]
schema: [{value: str}]
value:
tags: [resources/haproxy, resource/haproxy_keystone_config]

6
resources/mariadb_db/actions/run.yml
View File

@ -3,9 +3,9 @@
tasks:
- name: mariadb db
mysql_db:
name: {{db_name}}
name: {{ db_name }}
state: present
login_user: root
login_password: {{login_password}}
login_port: {{login_port}}
login_password: {{ login_password }}
login_port: {{ login_port }}
login_host: 127.0.0.1

4
resources/mariadb_service/meta.yaml
View File

@ -9,10 +9,10 @@ input:
schema: str!
value: password
port:
schema: str!
schema: int!
value: 3306
ip:
schema: int!
schema: str!
value:
ssh_key:
schema: str!

10
resources/mariadb_user/actions/run.yml
View File

@ -3,12 +3,12 @@
tasks:
- name: mariadb user
mysql_user:
name: {{new_user_name}}
password: {{new_user_password}}
priv: {{db_name}}.*:ALL
name: {{ new_user_name }}
password: {{ new_user_password }}
priv: {{ db_name }}.*:ALL
host: '%'
state: present
login_user: root
login_password: {{login_password}}
login_port: {{login_port}}
login_password: {{ login_password }}
login_port: {{ login_port }}
login_host: 127.0.0.1