Merge pull request #49 from malscent/MB-47142-SpecifyDisk

Fix issue where we were calling Amazon Metadata service

.github/workflows/StackTests.yml

@@ -49,7 +49,7 @@ jobs:
       - name: Docker containers running?
         run: docker ps
       - name: Test
-        run: while ! curl http://localhost:8081/ui/index.html; do sleep 10; done;
+        run: while ! curl http://localhost:8091/ui/index.html; do sleep 10; done;
         timeout-minutes: 15
       - name: Teardown
         run: docker-compose -f ./compose-files/UbuntuClusterCompose.yml down

compose-files/UbuntuClusterCompose.yml

@@ -8,7 +8,7 @@ services:
     hostname: 'clusterhost'
     tty: true
     ports: 
-      - "8080:8091"
+      - "8091:8091"
     networks:
       - cb-net-ubuntu
     container_name: ubuntu-clusterhost
@@ -23,7 +23,7 @@ services:
     networks:
       - cb-net-ubuntu
     ports: 
-      - "8081:8091"
+      - "9091:8091"
     container_name: ubuntu-node-one
     command: --version 7.0.2 -u couchbase -p foo123! -ch ubuntu-clusterhost -d -os UBUNTU -r
     privileged: true
@@ -36,7 +36,7 @@ services:
     networks:
       - cb-net-ubuntu
     ports: 
-      - "8082:8091"
+      - "9092:8091"
     container_name: ubuntu-node-two
     command: --version 7.0.2 -u couchbase -p foo123! -ch ubuntu-clusterhost -d -os UBUNTU -r
     privileged: true
@@ -49,7 +49,7 @@ services:
     networks:
       - cb-net-ubuntu
     ports: 
-      - "8083:8091"
+      - "9093:8091"
     container_name: ubuntu-no-cluster
     command: --version 7.0.2 -u couchbase -p foo123! -ch ubuntu-clusterhost -d -os UBUNTU -r --no-cluster --services data,index,query,analytics,eventing,fts -dm 256 -im 256 -qm 256 -am 1024 -em 256 -sm 256
     privileged: true    
@@ -62,8 +62,8 @@ services:
     networks:
       - cb-net-ubuntu
     ports: 
-      - "8085:4985"
-      - "8086:4984"
+      - "9095:4985"
+      - "9096:4984"
     container_name: gateway
     command: --version 2.8.2 -u couchbase -p foo123! -ch ubuntu-clusterhost -d -os UBUNTU -g -r
     privileged: true  

main.sh

@@ -291,24 +291,21 @@ fi
 #installing prerequisites from installer
 __install_prerequisites "$OS" "$ENV" "$SYNC_GATEWAY"
 
-PUBLIC_HOSTNAME=""
 #Getting information to determine whether this is the cluster host or not.
-if [[ "$OS" == "AMAZON" ]]; then
-  LOCAL_IP=$(ifconfig | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1')
-  HOST=$(hostname) || hostnamectl
-  PUBLIC_HOSTNAME=$(wget -O - http://169.254.169.254/latest/meta-data/public-hostname -q) || PUBLIC_HOSTNAME=$(hostname)
-else
-  LOCAL_IP=$(ifconfig | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1')
-  HOST=$(hostname) || hostnamectl
-fi
+LOCAL_IP=$(ifconfig | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1')
+HOST=$(hostname) || hostnamectl
+# Do a reverse DNS lookup on the cluster host and see if it is this local ip
+PUBLIC_HOST_IP=$(dig +short "$CLUSTER_HOST")
+
 __log_debug "Hostname:  ${HOST}"
 __log_debug "Local IP: ${LOCAL_IP}"
 
 # Check if host is cluster host, or local ip, or if the clusterhost contains the host for FQDN on GCP
+
 if [[ "$CLUSTER_HOST" == "$HOST" ]] || 
    [[ "$CLUSTER_HOST" == "$LOCAL_IP" ]] || 
    [[ "$CLUSTER_HOST" == *"$HOST"* ]] || 
-   [[ "$CLUSTER_HOST" == "$PUBLIC_HOSTNAME" ]]; then
+   [[ "$PUBLIC_HOST_IP" == "$LOCAL_IP" ]]; then
     __log_info "${CLUSTER_HOST} is host and is this machine"
     DO_CLUSTER=1
 fi

test_scripts/ubuntu/Dockerfile

@@ -1,5 +1,5 @@
 FROM ubuntu:18.04
-RUN apt-get update && apt-get install -y python procps && apt-get clean
+RUN apt-get update && apt-get install -y python procps dnsutils && apt-get clean
 COPY . /app
 COPY ./test_scripts/docker/systemctl.py /usr/bin/systemctl
 RUN chmod +x /usr/bin/systemctl