From 731b418031454b3befda50c1e52e943c6d2df4ce Mon Sep 17 00:00:00 2001 From: Evgeniy L Date: Wed, 27 May 2015 14:24:18 +0200 Subject: [PATCH] Added defaults for resources --- resources/docker/actions/run.yml | 9 +++++++++ resources/docker/meta.yaml | 12 ++++++++++++ .../meta.yaml | 8 +++++--- resources/keystone_config/meta.yaml | 16 ++++++++++------ resources/keystone_service/meta.yaml | 4 ++-- resources/mariadb_service/meta.yaml | 6 +++--- 6 files changed, 41 insertions(+), 14 deletions(-) create mode 100644 resources/docker/actions/run.yml create mode 100644 resources/docker/meta.yaml rename resources/{haproxy_config => haproxy_keystone_config}/meta.yaml (58%) diff --git a/resources/docker/actions/run.yml b/resources/docker/actions/run.yml new file mode 100644 index 00000000..63187d92 --- /dev/null +++ b/resources/docker/actions/run.yml @@ -0,0 +1,9 @@ + +- hosts: [resource/docker] + sudo: yes + tasks: + - shell: docker --version + ignore_errors: true + register: docker_version + - shell: curl -sSL https://get.docker.com/ | sudo sh + when: docker_version|failed diff --git a/resources/docker/meta.yaml b/resources/docker/meta.yaml new file mode 100644 index 00000000..9845a363 --- /dev/null +++ b/resources/docker/meta.yaml @@ -0,0 +1,12 @@ +id: docker +handler: ansible +version: 1.0.0 + +input: + ip: + ssh_user: + ssh_key: + +input-types: + +tags: [resource/docker] diff --git a/resources/haproxy_config/meta.yaml b/resources/haproxy_keystone_config/meta.yaml similarity index 58% rename from resources/haproxy_config/meta.yaml rename to resources/haproxy_keystone_config/meta.yaml index 307b5345..0d33630f 100644 --- a/resources/haproxy_config/meta.yaml +++ b/resources/haproxy_keystone_config/meta.yaml @@ -1,16 +1,18 @@ -id: haproxy_config +id: haproxy_keystone_config handler: none version: 1.0.0 input: name: schema: str! - value: + value: keystone-admin listen_port: schema: int! - value: + value: 9999 ports: schema: [int] value: servers: schema: [str] value: + +tags: [resources/haproxy, resource/haproxy_keystone_config] diff --git a/resources/keystone_config/meta.yaml b/resources/keystone_config/meta.yaml index 61e49722..9746f2db 100644 --- a/resources/keystone_config/meta.yaml +++ b/resources/keystone_config/meta.yaml @@ -1,25 +1,29 @@ id: keystone_config handler: ansible version: 1.0.0 + input: config_dir: schema: str! value: admin_token: schema: str! - value: - db_user: - schema: str! - value: + value: /etc/solar/keystone db_password: schema: str! - value: + value: password + db_user: + schema: str! + value: keystone db_host: schema: str! value: + db_port: + schema: str! + value: db_name: schema: str! - value: + value: keystone ip: schema: str! value: diff --git a/resources/keystone_service/meta.yaml b/resources/keystone_service/meta.yaml index f3d8c8f9..be5b3892 100644 --- a/resources/keystone_service/meta.yaml +++ b/resources/keystone_service/meta.yaml @@ -7,7 +7,7 @@ input: value: kollaglue/centos-rdo-keystone config_dir: schema: str! - value: + value: /etc/solar/keystone port: schema: int! value: @@ -24,4 +24,4 @@ input: schema: str! value: -tags: [resource/keystone, resources/keystone] +tags: [resource/keystone_service, resources/keystone] diff --git a/resources/mariadb_service/meta.yaml b/resources/mariadb_service/meta.yaml index 5d9a3ec9..0df9dd00 100644 --- a/resources/mariadb_service/meta.yaml +++ b/resources/mariadb_service/meta.yaml @@ -4,13 +4,13 @@ version: 1.0.0 input: image: schema: str! - value: + value: kollaglue/fedora-rdo-mariadb-app root_password: schema: str! - value: + value: password port: schema: str! - value: + value: 3306 ip: schema: int! value: