diff --git a/ansible/playbook.yml b/ansible/playbook.yml deleted file mode 100644 index 6a8c9e3..0000000 --- a/ansible/playbook.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- hosts: localhost - roles: - - common - - dynomite - - elasticsearch - - conductor diff --git a/ansible/roles/common/defaults/main.yaml b/ansible/roles/common/defaults/main.yaml index 40272be..8dd9588 100644 --- a/ansible/roles/common/defaults/main.yaml +++ b/ansible/roles/common/defaults/main.yaml @@ -1,3 +1,3 @@ --- -target_path: /tmp/conductor_setup_test +target_path: /tmp/conductor_stack conductor_network: conductor-network diff --git a/ansible/roles/conductor/templates/conductor-swarm.yaml.j2 b/ansible/roles/conductor/templates/conductor-swarm.yaml.j2 index 4d5eef3..42ff507 100644 --- a/ansible/roles/conductor/templates/conductor-swarm.yaml.j2 +++ b/ansible/roles/conductor/templates/conductor-swarm.yaml.j2 @@ -22,7 +22,7 @@ services: window: 120s configs: - source: swarm-config - target: /app/config/{{ conductor_network }} + target: /app/config/{{ conductor_config }} logging: driver: "journald" diff --git a/ansible/site.yaml b/ansible/site.yaml new file mode 100644 index 0000000..14f1c3d --- /dev/null +++ b/ansible/site.yaml @@ -0,0 +1,28 @@ +--- +#- hosts: localhost +# roles: +# - common +# - dynomite +# - elasticsearch +# tasks: +# - name: Start dynomite and es +# docker_stack: +# name: conductor +# state: present +# compose: +# - "{{ target_path }}/dynomite-swarm.yaml" +# - "{{ target_path }}/elasticsearch-swarm.yaml" + + +- hosts: localhost + roles: + - common + - conductor + tasks: + - name: Start conductor + docker_stack: + name: conductor + state: present + compose: + - "{{ target_path }}/conductor-swarm.yaml" + diff --git a/dynomite/scripts/startup.sh b/dynomite/scripts/startup.sh index 7f92a91..302232f 100755 --- a/dynomite/scripts/startup.sh +++ b/dynomite/scripts/startup.sh @@ -28,4 +28,4 @@ echo "I am $NODE" #Start redis server on 22122 redis-server --port 22122 & -src/dynomite --conf-file=/dynomite/auto_dynomite.yml -v11 +src/dynomite --conf-file=/dynomite/auto_dynomite.yml #-v11