Merge pull request #116 from pigmej/jnowak/pluggable_transports

Pluggable transports
2015-09-08 15:34:56 +02:00 · 2015-09-08 15:34:56 +02:00 · 53e08f7003
commit 53e08f7003
parent 27747885e3 0c4eb29184
50 changed files with 78 additions and 65 deletions
--- a/resources/data_container/actions/echo.yml
+++ b/resources/data_container/actions/echo.yml
@ -1,5 +1,5 @@

- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - shell: echo `/sbin/ifconfig`
--- a/resources/data_container/actions/remove.yml
+++ b/resources/data_container/actions/remove.yml
@ -1,5 +1,5 @@

- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - shell: docker stop {{ resource_name }}
--- a/resources/data_container/actions/run.yml
+++ b/resources/data_container/actions/run.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - docker:
--- a/resources/docker/actions/run.yml
+++ b/resources/docker/actions/run.yml
@ -1,5 +1,5 @@

- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - shell: docker --version
--- a/resources/docker_container/actions/remove.yml
+++ b/resources/docker_container/actions/remove.yml
@ -1,5 +1,5 @@

- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - shell: docker stop {{ resource_name }}
--- a/resources/docker_container/actions/run.yml
+++ b/resources/docker_container/actions/run.yml
@ -1,5 +1,5 @@

- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - docker:
--- a/resources/glance_api_service/actions/remove.yml
+++ b/resources/glance_api_service/actions/remove.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - name: glance api container
--- a/resources/glance_api_service/actions/run.yml
+++ b/resources/glance_api_service/actions/run.yml
@ -1,5 +1,5 @@

- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - docker:
--- a/resources/glance_config/actions/remove.yml
+++ b/resources/glance_config/actions/remove.yml
@ -1,5 +1,5 @@

- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - shell: echo 'removed'
--- a/resources/glance_config/actions/run.yml
+++ b/resources/glance_config/actions/run.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  vars:
    ip: {{ ip }}
@ -26,12 +26,12 @@
    - file: path={{ config_dir.value['src'] }}/policy.json state=touch
    - file: path={{ config_dir.value['src'] }}/schema-image.json state=touch
    - file: path={{ config_dir.value['src'] }}/exports state=touch
-    - template: src={{ resource_dir }}/templates/glance-api.conf dest={{ config_dir.value['src'] }}/glance-api.conf
-    - template: src={{ resource_dir }}/templates/glance-api-paste.ini dest={{ config_dir.value['src'] }}/glance-api-paste.ini
-    - template: src={{ resource_dir }}/templates/glance-cache.conf dest={{ config_dir.value['src'] }}/glance-cache.conf
-    - template: src={{ resource_dir }}/templates/glance-registry.conf dest={{ config_dir.value['src'] }}/glance-registry.conf
-    - template: src={{ resource_dir }}/templates/glance-registry-paste.ini dest={{ config_dir.value['src'] }}/glance-registry-paste.ini
-    - template: src={{ resource_dir }}/templates/glance-scrubber.conf dest={{ config_dir.value['src'] }}/glance-scrubber.conf
-    - template: src={{ resource_dir }}/templates/policy.json dest={{ config_dir.value['src'] }}/policy.json
-    - template: src={{ resource_dir }}/templates/schema-image.json dest={{ config_dir.value['src'] }}/schema-image.json
-    - template: src={{ resource_dir }}/templates/exports dest={{ config_dir.value['src'] }}/glance-export
+    - template: src={{templates_dir}}/glance-api.conf dest={{ config_dir.value['src'] }}/glance-api.conf
+    - template: src={{templates_dir}}/glance-api-paste.ini dest={{ config_dir.value['src'] }}/glance-api-paste.ini
+    - template: src={{templates_dir}}/glance-cache.conf dest={{ config_dir.value['src'] }}/glance-cache.conf
+    - template: src={{templates_dir}}/glance-registry.conf dest={{ config_dir.value['src'] }}/glance-registry.conf
+    - template: src={{templates_dir}}/glance-registry-paste.ini dest={{ config_dir.value['src'] }}/glance-registry-paste.ini
+    - template: src={{templates_dir}}/glance-scrubber.conf dest={{ config_dir.value['src'] }}/glance-scrubber.conf
+    - template: src={{templates_dir}}/policy.json dest={{ config_dir.value['src'] }}/policy.json
+    - template: src={{templates_dir}}/schema-image.json dest={{ config_dir.value['src'] }}/schema-image.json
+    - template: src={{templates_dir}}/exports dest={{ config_dir.value['src'] }}/glance-export
--- a/resources/glance_registry_service/actions/remove.yml
+++ b/resources/glance_registry_service/actions/remove.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - name: glance registry container
--- a/resources/glance_registry_service/actions/run.yml
+++ b/resources/glance_registry_service/actions/run.yml
@ -1,5 +1,5 @@

- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - docker:
--- a/resources/haproxy_config/actions/remove.yml
+++ b/resources/haproxy_config/actions/remove.yml
@ -1,5 +1,5 @@
 # TODO
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - file: path={{ config_dir.value['src'] }} state=absent
--- a/resources/haproxy_config/actions/run.yml
+++ b/resources/haproxy_config/actions/run.yml
@ -1,5 +1,5 @@
 # TODO
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  vars:
    config_dir: {src: {{ config_dir.value['src'] }}, dst: {{ config_dir.value['dst'] }}}
@ -19,4 +19,4 @@
  tasks:
    - file: path={{ config_dir.value['src'] }}/ state=directory
    - file: path={{ config_dir.value['src'] }}/haproxy.cfg state=touch
-    - template: src={{ resource_dir }}/templates/haproxy.cfg dest=/etc/haproxy/haproxy.cfg
+    - template: src={{templates_dir}}/haproxy.cfg dest=/etc/haproxy/haproxy.cfg
--- a/resources/haproxy_config/actions/update.yml
+++ b/resources/haproxy_config/actions/update.yml
@ -19,4 +19,4 @@
  tasks:
    - file: path={{ config_dir.value['src'] }}/ state=directory
    - file: path={{ config_dir.value['src'] }}/haproxy.cfg state=touch
-    - template: src={{ resource_dir }}/templates/haproxy.cfg dest=/etc/haproxy/haproxy.cfg
+    - template: src={{templates_dir}}/haproxy.cfg dest=/etc/haproxy/haproxy.cfg
--- a/resources/haproxy_service/actions/install.yml
+++ b/resources/haproxy_service/actions/install.yml
@ -0,0 +1,10 @@
+- hosts: [{{host}}]
+  sudo: yes
+  tasks:
+    - apt:
+        name: haproxy
+        state: present
+    - replace:
+        dest: '/etc/default/haproxy'
+        regexp: ENABLED=0
+        replace: ENABLED=1
--- a/resources/haproxy_service/actions/remove.yml
+++ b/resources/haproxy_service/actions/remove.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - name: haproxy container
--- a/resources/haproxy_service/actions/run.yml
+++ b/resources/haproxy_service/actions/run.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - apt:
--- a/resources/haproxy_service/actions/update.yml
+++ b/resources/haproxy_service/actions/update.yml
@ -1,5 +1,5 @@

- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - service:
--- a/resources/hosts_file/actions/run.yml
+++ b/resources/hosts_file/actions/run.yml
@ -1,4 +1,4 @@
- hosts: {{ip}}
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    {% for ip, host in zip(hosts_ips.value, hosts_names.value) %}
--- a/resources/keystone_config/actions/remove.yml
+++ b/resources/keystone_config/actions/remove.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - file: path={{config_dir}} state=absent
--- a/resources/keystone_config/actions/run.yml
+++ b/resources/keystone_config/actions/run.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  vars:
    admin_token: {{admin_token}}
@ -10,8 +10,8 @@
    db_name: {{db_name}}
  tasks:
    - file: path={{config_dir}} state=directory
-    - template: src={{resource_dir}}/templates/keystone.conf dest={{config_dir}}/keystone.conf
-    - template: src={{resource_dir}}/templates/default_catalog.templates dest={{config_dir}}/default_catalog.templates
-    - template: src={{resource_dir}}/templates/logging.conf dest={{config_dir}}/logging.conf
-    - template: src={{resource_dir}}/templates/policy.json dest={{config_dir}}/policy.json
-    - template: src={{resource_dir}}/templates/exports dest={{ config_dir }}/keystone-exports
+    - template: src={{templates_dir}}/keystone.conf dest={{config_dir}}/keystone.conf
+    - template: src={{templates_dir}}/default_catalog.templates dest={{config_dir}}/default_catalog.templates
+    - template: src={{templates_dir}}/logging.conf dest={{config_dir}}/logging.conf
+    - template: src={{templates_dir}}/policy.json dest={{config_dir}}/policy.json
+    - template: src={{templates_dir}}/exports dest={{ config_dir }}/keystone-exports
--- a/resources/keystone_role/actions/remove.yml
+++ b/resources/keystone_role/actions/remove.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - name: keystone role
--- a/resources/keystone_role/actions/run.yml
+++ b/resources/keystone_role/actions/run.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - name: install python-keystoneclient
--- a/resources/keystone_service/actions/remove.yml
+++ b/resources/keystone_service/actions/remove.yml
@ -1,5 +1,5 @@
 # TODO
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - name: keystone container
--- a/resources/keystone_service/actions/run.yml
+++ b/resources/keystone_service/actions/run.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - name: keystone container
--- a/resources/keystone_tenant/actions/remove.yml
+++ b/resources/keystone_tenant/actions/remove.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - name: keystone tenant
--- a/resources/keystone_tenant/actions/run.yml
+++ b/resources/keystone_tenant/actions/run.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - name: install python-keystoneclient
--- a/resources/keystone_user/actions/remove.yml
+++ b/resources/keystone_user/actions/remove.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - name: keystone user
--- a/resources/keystone_user/actions/run.yml
+++ b/resources/keystone_user/actions/run.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - name: install python-keystoneclient
--- a/resources/mariadb_db/actions/remove.yml
+++ b/resources/mariadb_db/actions/remove.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - name: mariadb db
--- a/resources/mariadb_db/actions/run.yml
+++ b/resources/mariadb_db/actions/run.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - name: mariadb db
--- a/resources/mariadb_service/actions/remove.yml
+++ b/resources/mariadb_service/actions/remove.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - name: mariadb container
--- a/resources/mariadb_service/actions/run.yml
+++ b/resources/mariadb_service/actions/run.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - name: mariadb container
--- a/resources/mariadb_user/actions/remove.yml
+++ b/resources/mariadb_user/actions/remove.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - name: mariadb user
--- a/resources/mariadb_user/actions/run.yml
+++ b/resources/mariadb_user/actions/run.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - name: mariadb user
--- a/resources/openrc_file/actions/run.yaml
+++ b/resources/openrc_file/actions/run.yaml
@ -7,4 +7,4 @@
    keystone_host: {{keystone_host}}
    keystone_port: {{keystone_port}}
  tasks:
-    - template: src={{resource_dir}}/templates/openrc.template dest=/root/openrc
+    - template: src={{templates_dir}}/openrc.template dest=/root/openrc
--- a/resources/rabbitmq_config/actions/remove.yml
+++ b/resources/rabbitmq_config/actions/remove.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - file: path={{config_dir}} state=absent
--- a/resources/rabbitmq_config/actions/run.yml
+++ b/resources/rabbitmq_config/actions/run.yml
@ -1,8 +1,8 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  vars:
    admin_user: {{admin_user}}
    admin_password: {{admin_password}}
  tasks:
    - file: path={{config_dir}} state=directory
-    - template: src={{resource_dir}}/templates/rabbitmq.conf dest={{config_dir}}/rabbitmq.conf
+    - template: src={{templates_dir}}/rabbitmq.conf dest={{config_dir}}/rabbitmq.conf
--- a/resources/rabbitmq_user/actions/remove.yml
+++ b/resources/rabbitmq_user/actions/remove.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - rabbitmq_user: user={{user_name}}
--- a/resources/rabbitmq_user/actions/run.yml
+++ b/resources/rabbitmq_user/actions/run.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - rabbitmq_user: user={{user_name}}
--- a/resources/rabbitmq_vhost/actions/remove.yml
+++ b/resources/rabbitmq_vhost/actions/remove.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - rabbitmq_vhost: name={{vhost_name}}
--- a/resources/rabbitmq_vhost/actions/run.yml
+++ b/resources/rabbitmq_vhost/actions/run.yml
@ -1,4 +1,4 @@
- hosts: [{{ ip }}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
      - rabbitmq_vhost: name={{vhost_name}}
--- a/resources/riak_join_single/actions/join.yml
+++ b/resources/riak_join_single/actions/join.yml
@ -1,4 +1,4 @@
- hosts: [{{ip}}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - shell: riak-admin cluster join {{join_to}}
--- a/resources/riak_node/actions/commit.yml
+++ b/resources/riak_node/actions/commit.yml
@ -1,4 +1,4 @@
- hosts: [{{ip}}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    # - shell: sleep 30
--- a/resources/riak_node/actions/join.yml
+++ b/resources/riak_node/actions/join.yml
@ -1,4 +1,4 @@
- hosts: [{{ip}}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - shell: riak-admin cluster join {{join_to}}
--- a/resources/riak_node/actions/remove.yml
+++ b/resources/riak_node/actions/remove.yml
@ -1,4 +1,4 @@
- hosts: [{{ip}}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    - apt:
--- a/resources/riak_node/actions/run.yml
+++ b/resources/riak_node/actions/run.yml
@ -1,4 +1,4 @@
- hosts: [{{ip}}]
+- hosts: [{{host}}]
  sudo: yes
  tasks:
    # those below are mostly for tests
@ -18,7 +18,7 @@
        state: stopped
    - file: path=/etc/riak/riak.conf state=touch
    - template:
-        src: {{ resource_dir }}/templates/riak.conf
+        src: {{templates_dir}}/riak.conf
        dest: /etc/riak/riak.conf
    - shell: rm -fr /var/lib/riak/kv_vnode/*
    - shell: rm -fr /var/lib/riak/ring/*
--- a/resources/riak_node/actions/update.yml
+++ b/resources/riak_node/actions/update.yml
@ -5,7 +5,7 @@
        name: riak
        state: stopped
    - template:
-        src: {{ resource_dir }}/templates/riak.conf
+        src: {{templates_dir}}/riak.conf
        dest: /etc/riak/riak.conf
    - service:
        name: riak
--- a/resources/ro_node/meta.yaml
+++ b/resources/ro_node/meta.yaml
@ -15,3 +15,6 @@ input:
    ssh_user:
      schema: str!
      value:
+    name:
+      schema: str
+      value: a node