diff --git a/ansible/roles/cluster-build/tasks/main.yaml b/ansible/roles/cluster-build/tasks/main.yaml index 335e1fab4ec44174c6fb30438f22f5e734cef90c..ce7be945baea5e28129258c945deb1c63ce0db44 100644 --- a/ansible/roles/cluster-build/tasks/main.yaml +++ b/ansible/roles/cluster-build/tasks/main.yaml @@ -6,7 +6,7 @@ name: ['node','npm','grunt','jq'] state: latest -- name: Copy harvester +- name: Copy package-lock become: yes template: src: package-lock.json @@ -14,7 +14,7 @@ owner: "{{ ansible_user }}" group: "{{ ansible_user }}" -- name: Copy harvester +- name: Copy package.json become: yes template: src: package.json @@ -25,6 +25,9 @@ - name: NPM become: yes script: ./templates/install.sh + register: build + +- debug: var=build.stdout_lines # - debug: var=ansible_default_ipv4.address diff --git a/ansible/roles/cluster-build/templates/run.sh b/ansible/roles/cluster-build/templates/run.sh index 2be059926f9ec53082a842e04b80a7f43ca300f0..c78908825569c2d370966696140a7d9894b1bd05 100644 --- a/ansible/roles/cluster-build/templates/run.sh +++ b/ansible/roles/cluster-build/templates/run.sh @@ -49,7 +49,8 @@ echo "== Change vm.args ==" 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 "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" # for cont in "${conts[@]}"; do sudo docker exec -u root -it ${cont} bash edit-vm.sh; done #sudo docker exec -it couchdb bash diff --git a/ansible/roles/slaves-cluster/templates/set-cluster-t.sh b/ansible/roles/slaves-cluster/templates/set-cluster-t.sh index 24027aaada6911826a4e804d927772678e8fbd51..4bad529776d2c272b6e1e7e238b2734549d513c2 100644 --- a/ansible/roles/slaves-cluster/templates/set-cluster-t.sh +++ b/ansible/roles/slaves-cluster/templates/set-cluster-t.sh @@ -23,7 +23,7 @@ do --header "Content-Type: application/json"\ --data "{\"action\": \"enable_cluster\", \"bind_address\":\"0.0.0.0\",\ \"username\": \"${user}\", \"password\":\"${pass}\", \"port\": \"5984\",\ - \"remote_node\": \"${node}\", \"node_count\": \"$(echo ${nodes[@]} | wc -w)\",\ + \"remote_node\": \"${node}\", \"node_count\": \"3\",\ \"remote_current_user\":\"${user}\", \"remote_current_password\":\"${pass}\"}" done