From 48731e11b63f1a8c91640a9bb5a5893a15c4fb70 Mon Sep 17 00:00:00 2001 From: matt01671 <matt01671@gmail.com> Date: Wed, 6 May 2020 10:59:29 +1200 Subject: [PATCH] clean --- ansible/roles/cluster-build/tasks/main.yaml | 7 +++++-- ansible/roles/cluster-build/templates/reboot.sh | 9 +++++---- ansible/roles/cluster-build/templates/run.sh | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ansible/roles/cluster-build/tasks/main.yaml b/ansible/roles/cluster-build/tasks/main.yaml index ce7be94..36a1f34 100644 --- a/ansible/roles/cluster-build/tasks/main.yaml +++ b/ansible/roles/cluster-build/tasks/main.yaml @@ -27,7 +27,7 @@ script: ./templates/install.sh register: build -- debug: var=build.stdout_lines +# - debug: var=build.stdout_lines # - debug: var=ansible_default_ipv4.address @@ -47,8 +47,11 @@ # - name: Reboot machine # become: yes # reboot: -# reboot_timeout: 3000 +# reboot_timeout: 3000MGVjNGJjYTU2ZmZmZGQx + - name: Reboot CouchDB script: ./templates/reboot.sh '{{ ansible_default_ipv4.address }}' + register: reboot +- debug: var=reboot.stdout_lines \ No newline at end of file diff --git a/ansible/roles/cluster-build/templates/reboot.sh b/ansible/roles/cluster-build/templates/reboot.sh index 1690415..b5d3744 100644 --- a/ansible/roles/cluster-build/templates/reboot.sh +++ b/ansible/roles/cluster-build/templates/reboot.sh @@ -2,8 +2,9 @@ # declare -a conts=(`sudo docker ps --all | grep couchdb | cut -f1 -d' ' | xargs -n1 -d'\n'`) export node="$1" -echo "== Stop the containers: ==" -sudo docker stop couchdb${node} +sudo docker restart couchdb${node} +# echo "== Stop the containers: ==" +# sudo docker stop couchdb${node} -echo "== Start the containers (and wait a bit while they boot): ==" -sudo docker start couchdb${node} \ No newline at end of file +# echo "== Start the containers (and wait a bit while they boot): ==" +# sudo docker start couchdb${node} \ No newline at end of file diff --git a/ansible/roles/cluster-build/templates/run.sh b/ansible/roles/cluster-build/templates/run.sh index c789088..c2aae40 100644 --- a/ansible/roles/cluster-build/templates/run.sh +++ b/ansible/roles/cluster-build/templates/run.sh @@ -50,7 +50,7 @@ echo "cd /opt/couchdb/etc/;echo ${NOOENAME} >> vm.args" sudo docker exec -u root -it couchdb${node} /bin/sh -c "export node=${node}; cd /opt/couchdb/etc/;echo -name couchdb@${node} >> vm.args;exit" sudo docker exec -u root -it couchdb${node} /bin/sh -c "export cookie=${cookie};cd /opt/couchdb/etc/;echo -setcookie ${cookie} >> vm.args;exit" # sudo docker exec -u root -it couchdb${node} /bin/sh -c "export flag=${flag};cd /opt/couchdb/etc/;echo ${flag} >> vm.args;exit" -sudo docker exec -u root -it couchdb${node} /bin/sh -c "cd /opt/couchdb/etc/;sed -it 's/max 9110/max 9200/g' vm.args;exit" +sudo docker exec -u root -it couchdb${node} /bin/sh -c "cd /opt/couchdb/etc/;sed -it 's/max 9100/max 9200/g' vm.args;exit" # for cont in "${conts[@]}"; do sudo docker exec -u root -it ${cont} bash edit-vm.sh; done #sudo docker exec -it couchdb bash -- GitLab