From 4fb20531ee25b86f4cbc103406c957c5ca8fcda8 Mon Sep 17 00:00:00 2001
From: matt01671 <matt01671@gmail.com>
Date: Wed, 6 May 2020 15:20:56 +1200
Subject: [PATCH] ready for input
---
ansible/host_vars/nectar.yaml | 18 +++++++++---------
ansible/hosts | 6 +++---
ansible/roles/cluster-build/tasks/main.yaml | 9 ++++-----
.../slaves-cluster/templates/set-cluster-t.sh | 2 +-
4 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/ansible/host_vars/nectar.yaml b/ansible/host_vars/nectar.yaml
index 6824b82..862de34 100755
--- a/ansible/host_vars/nectar.yaml
+++ b/ansible/host_vars/nectar.yaml
@@ -4,13 +4,13 @@ availability_zone: melbourne-qh2-uom
# Volume
volumes:
- vol_name: dbvolume1
- vol_size: 10 #CHANGE TO HIGHER WHEN READY FOR COLLECTING
+ vol_size: 50 #CHANGE TO HIGHER WHEN READY FOR COLLECTING
- vol_name: dbvolume2
- vol_size: 10
+ vol_size: 50
- vol_name: dbvolume3
- vol_size: 10
- - vol_name: webvolume
- vol_size: 10
+ vol_size: 50
+ # - vol_name: webvolume
+ # vol_size: 30
# Security group
security_groups:
@@ -67,10 +67,10 @@ instances:
volumes: ['dbvolume3']
meta:
group: slaves
- - name: web
- volumes: ['webvolume']
- meta:
- group: web
+ # - name: web
+ # volumes: ['webvolume']
+ # meta:
+ # group: web
instance_image: 45225edb-66d8-4fd0-bf41-132a31a18166
instance_key_name: test-moh
diff --git a/ansible/hosts b/ansible/hosts
index 9daef3c..2b21702 100644
--- a/ansible/hosts
+++ b/ansible/hosts
@@ -1,11 +1,11 @@
[web]
[master]
-172.26.129.221 ansible_host=172.26.129.221
+172.26.133.128 ansible_host=172.26.133.128
[slaves]
-172.26.132.138 ansible_host=172.26.132.138
-172.26.133.98 ansible_host=172.26.133.98
+172.26.134.57 ansible_host=172.26.134.57
+172.26.133.52 ansible_host=172.26.133.52
[dbs:children]
master
diff --git a/ansible/roles/cluster-build/tasks/main.yaml b/ansible/roles/cluster-build/tasks/main.yaml
index 36a1f34..3ce0e37 100644
--- a/ansible/roles/cluster-build/tasks/main.yaml
+++ b/ansible/roles/cluster-build/tasks/main.yaml
@@ -49,9 +49,8 @@
# reboot:
# reboot_timeout: 3000MGVjNGJjYTU2ZmZmZGQx
+# - name: Reboot CouchDB
+# script: ./templates/reboot.sh '{{ ansible_default_ipv4.address }}'
+# register: reboot
-- name: Reboot CouchDB
- script: ./templates/reboot.sh '{{ ansible_default_ipv4.address }}'
- register: reboot
-
-- debug: var=reboot.stdout_lines
\ No newline at end of file
+# - debug: var=reboot.stdout_lines
\ No newline at end of file
diff --git a/ansible/roles/slaves-cluster/templates/set-cluster-t.sh b/ansible/roles/slaves-cluster/templates/set-cluster-t.sh
index 4bad529..1db0382 100644
--- a/ansible/roles/slaves-cluster/templates/set-cluster-t.sh
+++ b/ansible/roles/slaves-cluster/templates/set-cluster-t.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
echo "== Set variables =="
-export declare -a nodes=(172.26.129.221 172.26.132.138 172.26.133.98)
+export declare -a nodes=(172.26.133.128 172.26.133.52 172.26.134.57) #NEED TO AUTOMATE
# export declare -a nodes=($1)
export user=admin
export pass=admin
--
GitLab