From f8da0f8af958b60eb4cfb9d0114328c24492e571 Mon Sep 17 00:00:00 2001
From: matt01671 <matt01671@gmail.com>
Date: Wed, 6 May 2020 14:38:24 +1200
Subject: [PATCH] cleaned up files
---
ansible/roles/slaves-cluster/tasks/main.yaml | 15 ------------
.../slaves-cluster/templates/set-cluster-1.sh | 24 -------------------
.../slaves-cluster/templates/set-cluster-2.sh | 15 ------------
.../slaves-cluster/templates/set-cluster-3.sh | 21 ----------------
4 files changed, 75 deletions(-)
delete mode 100644 ansible/roles/slaves-cluster/templates/set-cluster-1.sh
delete mode 100644 ansible/roles/slaves-cluster/templates/set-cluster-2.sh
delete mode 100644 ansible/roles/slaves-cluster/templates/set-cluster-3.sh
diff --git a/ansible/roles/slaves-cluster/tasks/main.yaml b/ansible/roles/slaves-cluster/tasks/main.yaml
index c0d05da..bde325a 100644
--- a/ansible/roles/slaves-cluster/tasks/main.yaml
+++ b/ansible/roles/slaves-cluster/tasks/main.yaml
@@ -3,19 +3,4 @@
script: ./templates/set-cluster-t.sh '{{ groups['dbs'] | map('extract', hostvars, ['ansible_host']) | join(' ') }}'
register: outt
-# - name: Build CouchDB Cluster
-# script: ./templates/set-cluster-1.sh '{{ ansible_default_ipv4.address }}' '{{ groups['dbs'] | map('extract', hostvars, ['ansible_host']) | join(' ') }}' '{{ groups['master'] | map('extract', hostvars, ['ansible_host']) | join(' ') }}'
-# register: out
-
-# - name: Build CouchDB Cluster
-# script: ./templates/set-cluster-2.sh '{{ ansible_default_ipv4.address }}' '{{ groups['dbs'] | map('extract', hostvars, ['ansible_host']) | join(' ') }}' '{{ groups['master'] | map('extract', hostvars, ['ansible_host']) | join(' ') }}'
-# register: out2
-
-# - name: Build CouchDB Cluster
-# script: ./templates/set-cluster-3.sh '{{ ansible_default_ipv4.address }}' '{{ groups['dbs'] | map('extract', hostvars, ['ansible_host']) | join(' ') }}' '{{ groups['master'] | map('extract', hostvars, ['ansible_host']) | join(' ') }}'
-# register: out3
-
-# - debug: var=out.stdout_lines
-# - debug: var=out2.stdout_lines
-# - debug: var=out3.stdout_lines
- debug: var=outt.stdout_lines
\ No newline at end of file
diff --git a/ansible/roles/slaves-cluster/templates/set-cluster-1.sh b/ansible/roles/slaves-cluster/templates/set-cluster-1.sh
deleted file mode 100644
index 3a4e497..0000000
--- a/ansible/roles/slaves-cluster/templates/set-cluster-1.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-echo "== Set variables =="
-export user=admin
-export pass=admin
-export VERSION='3.0.0'
-export cookie='a192aeb9904e6590849337933b000c99'
-export uuid='a192aeb9904e6590849337933b001159'
-export node=$1
-export declare -a nodes=($2)
-export masternode=$3
-
-# for node in "${nodes[@]}"
-# do
-# echo ${node}
-# done
-# echo ${masternode}
-echo "== Set up the CouchDB cluster: =="
-curl -XPOST "http://${user}:${pass}@${masternode}:5984/_cluster_setup" \
- --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_current_user\":\"${user}\", \"remote_current_password\":\"${pass}\"}"
\ No newline at end of file
diff --git a/ansible/roles/slaves-cluster/templates/set-cluster-2.sh b/ansible/roles/slaves-cluster/templates/set-cluster-2.sh
deleted file mode 100644
index e8755b9..0000000
--- a/ansible/roles/slaves-cluster/templates/set-cluster-2.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-echo "== Set variables =="
-export user=admin
-export pass=admin
-export VERSION='3.0.0'
-export cookie='a192aeb9904e6590849337933b000c99'
-export uuid='a192aeb9904e6590849337933b001159'
-export node=$1
-export masternode=$3
-
-curl -XPOST "http://${user}:${pass}@${masternode}:5984/_cluster_setup"\
- --header "Content-Type: application/json"\
- --data "{\"action\": \"add_node\", \"host\":\"${node}\",\
- \"port\": \"5984\", \"username\": \"${user}\", \"password\":\"${pass}\"}"
\ No newline at end of file
diff --git a/ansible/roles/slaves-cluster/templates/set-cluster-3.sh b/ansible/roles/slaves-cluster/templates/set-cluster-3.sh
deleted file mode 100644
index 0af76c6..0000000
--- a/ansible/roles/slaves-cluster/templates/set-cluster-3.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-echo "== Set variables =="
-export user=admin
-export pass=admin
-export VERSION='3.0.0'
-export cookie='a192aeb9904e6590849337933b000c99'
-export uuid='a192aeb9904e6590849337933b001159'
-export node=$1
-export declare -a nodes=($2)
-export masternode=$3
-
-curl -XPOST "http://${user}:${pass}@${masternode}:5984/_cluster_setup"\
- --header "Content-Type: application/json" --data "{\"action\": \"finish_cluster\"}"
-
-echo "== Check wether the cluster configuration is correct: =="
-for node in "${nodes[@]}"; do curl -X GET "http://${user}:${pass}@${node}:5984/_membership"; done
-
-echo "== Adding a database to one node of the cluster makes it to be created on all other nodes as well: =="
-curl -XPUT "http://${user}:${pass}@${masternode}:5984/twitter"
-for node in "${nodes[@]}"; do curl -X GET "http://${user}:${pass}@${node}:5984/_all_dbs"; done
\ No newline at end of file
--
GitLab