Merge pull request #170 from allthingsclowd/sept19binaries

Sept19binaries

.travis.yml

@@ -17,8 +17,8 @@ before_script:
 - if [ $VAGRANT_CLOUD_TOKEN ] ; then packer validate -syntax-only template.json ; fi
 - popd
 - cat /usr/local/bootstrap/var.env
-- sed -i 's/LEADER_IP=192.168.2.11/LEADER_IP=127.0.0.1/g' /usr/local/bootstrap/var.env
-- sed -i 's/REDIS_MASTER_IP=192.168.2.200/REDIS_MASTER_IP=127.0.0.1/g' /usr/local/bootstrap/var.env
+- sed -i 's/LEADER_IP=192.168.9.11/LEADER_IP=127.0.0.1/g' /usr/local/bootstrap/var.env
+- sed -i 's/REDIS_MASTER_IP=192.168.9.200/REDIS_MASTER_IP=127.0.0.1/g' /usr/local/bootstrap/var.env
 - cat /usr/local/bootstrap/var.env
 - bash scripts/install_consul.sh
 - bash scripts/consul_enable_acls_1.4.sh

Vagrantfile

@@ -31,26 +31,26 @@ Vagrant.configure("2") do |config|
 
     #override global variables to fit Vagrant setup
     ENV['REDIS_MASTER_NAME']||="masterredis01"
-    ENV['REDIS_MASTER_IP']||="192.168.2.200"
+    ENV['REDIS_MASTER_IP']||="192.168.9.200"
     ENV['GO_GUEST_PORT']||="808"
     ENV['GO_HOST_PORT']||="808"
     ENV['NGINX_NAME']||="web01"
-    ENV['NGINX_IP']||="192.168.2.250"
+    ENV['NGINX_IP']||="192.168.9.250"
     ENV['NGINX_PUBLIC_IP']||="192.168.94.90"
     ENV['NGINX_GUEST_PORT']||="9090"
     ENV['NGINX_HOST_PORT']||="9090"
     ENV['VAULT_NAME']||="vault01"
-    ENV['VAULT_IP']||="192.168.2.10"
+    ENV['VAULT_IP']||="192.168.9.10"
     ENV['LEADER_NAME']||="leader01"
-    ENV['LEADER_IP']||="192.168.2.11"
+    ENV['LEADER_IP']||="192.168.9.11"
     ENV['SERVER_COUNT']||="2"
     ENV['DD_API_KEY']||="ONLY REQUIRED FOR DATADOG IMPLEMENTATION"
 
     #global config
     config.vm.synced_folder ".", "/vagrant"
     config.vm.synced_folder ".", "/usr/local/bootstrap"
     config.vm.box = "allthingscloud/web-page-counter"
-    config.vm.box_version = "0.2.1554410947"
+    config.vm.box_version = "0.2.1567952288"
     config.vm.provision "shell", inline: "/usr/local/bootstrap/scripts/install_consul.sh", run: "always"
     config.vm.provision "shell", inline: "/usr/local/bootstrap/scripts/consul_enable_acls_1.4.sh", run: "always"
     config.vm.provision "shell", inline: "/usr/local/bootstrap/scripts/install_vault.sh", run: "always"
@@ -81,7 +81,7 @@ Vagrant.configure("2") do |config|
     (1..2).each do |i|
         config.vm.define "godev0#{i}" do |devsvr|
             devsvr.vm.hostname = "godev0#{i}"
-            devsvr.vm.network "private_network", ip: "192.168.2.#{100+i*10}"
+            devsvr.vm.network "private_network", ip: "192.168.9.#{100+i*10}"
             devsvr.vm.provision "shell", inline: "/usr/local/bootstrap/scripts/install_nomad.sh", run: "always"
             devsvr.vm.provision "shell", inline: "/usr/local/bootstrap/scripts/install_go_app.sh"
         end

conf/nomad.d/nomad.hcl

@@ -4,5 +4,5 @@ consul {
   ca_file   = "/etc/pki/tls/certs/consul-ca.pem"
   cert_file = "/etc/pki/tls/certs/server.pem"
   key_file  = "/etc/pki/tls/private/server-key.pem"
-  token = "b7c6d444-8c9e-83aa-a2a2-84444540c53b"
+  token = "58246247-12ea-2aae-22bd-f03d3c1c3634"
   }

conf/vault.d/vault.hcl

@@ -5,7 +5,7 @@
     tls_ca_file = "/etc/pki/tls/certs/consul-ca.pem"
     tls_cert_file = "/etc/pki/tls/certs/server.pem"
     tls_key_file = "/etc/pki/tls/private/server-key.pem"
-    token = "7044e9dc-54de-e492-e493-e51016a57505"
+    token = "0c8b7c50-0c01-56fe-9660-c63ca74c0f21"
   }
 
   ui = true

docs/nomad/ReadMe.md

@@ -28,7 +28,7 @@ job "webpagecounter" {
         driver = "raw_exec"
         config {
             command = "/usr/local/bin/webcounter"
-            args = ["-port=${NOMAD_PORT_http}", "-ip=0.0.0.0", "-consulACL=a2f24f63-6dae-799e-5529-f6cfd31982ef", "-consulIp=192.168.2.120:8321"]
+            args = ["-port=${NOMAD_PORT_http}", "-ip=0.0.0.0", "-consulACL=a2f24f63-6dae-799e-5529-f6cfd31982ef", "-consulIp=192.168.9.120:8321"]
         }
         resources {
           cpu    = 20

docs/travis/ReadMe.md

@@ -35,8 +35,8 @@ before_script:
 - if [ $VAGRANT_CLOUD_TOKEN ] ; then packer validate -syntax-only template.json ; fi
 - popd
 - cat /usr/local/bootstrap/var.env
-- sed -i 's/LEADER_IP=192.168.2.11/LEADER_IP=127.0.0.1/g' /usr/local/bootstrap/var.env
-- sed -i 's/REDIS_MASTER_IP=192.168.2.200/REDIS_MASTER_IP=127.0.0.1/g' /usr/local/bootstrap/var.env
+- sed -i 's/LEADER_IP=192.168.9.11/LEADER_IP=127.0.0.1/g' /usr/local/bootstrap/var.env
+- sed -i 's/REDIS_MASTER_IP=192.168.9.200/REDIS_MASTER_IP=127.0.0.1/g' /usr/local/bootstrap/var.env
 - cat /usr/local/bootstrap/var.env
 - bash scripts/install_consul.sh
 - bash scripts/consul_enable_acls_1.4.sh

docs/vagrant/ReadMe.md

@@ -59,20 +59,20 @@ en0: flags=8863<UP,BROADCAST,SMART,RUNNING,SIMPLEX,MULTICAST> mtu 1500
 
 ``` bash
 Grahams-MacBook-Pro:pipeline grazzer$ cat var.env
-export REDIS_MASTER_IP=192.168.2.200
+export REDIS_MASTER_IP=192.168.9.200
 export REDIS_MASTER_NAME=masterredis01.vagrant.local
 export REDIS_HOST_PORT=6379
 export GO_REPOSITORY=github.com/allthingsclowd/web_page_counter
 export GO_GUEST_PORT=8080
 export GO_HOST_PORT=8080
 export NGINX_NAME=nginx01.vagrant.local
-export NGINX_IP=192.168.2.250
+export NGINX_IP=192.168.9.250
 export NGINX_GUEST_PORT=9090
 export NGINX_HOST_PORT=9090
 export VAULT_NAME=vault01.vagrant.local
-export VAULT_IP=192.168.2.10
+export VAULT_IP=192.168.9.10
 export LEADER_NAME=leader01.vagrant.local
-export LEADER_IP=192.168.2.11
+export LEADER_IP=192.168.9.11
 export NGINX_PUBLIC_IP=192.168.83.53
 ```
 
@@ -123,18 +123,18 @@ Vagrant.configure("2") do |config|
 
     #override global variables to fit Vagrant setup
     ENV['REDIS_MASTER_NAME']||="masterredis01"
-    ENV['REDIS_MASTER_IP']||="192.168.2.200"
+    ENV['REDIS_MASTER_IP']||="192.168.9.200"
     ENV['GO_GUEST_PORT']||="808"
     ENV['GO_HOST_PORT']||="808"
     ENV['NGINX_NAME']||="web01"
-    ENV['NGINX_IP']||="192.168.2.250"
+    ENV['NGINX_IP']||="192.168.9.250"
     ENV['NGINX_PUBLIC_IP']||="UPDATE TO MATCH YOUR HOST IP"
     ENV['NGINX_GUEST_PORT']||="9090"
     ENV['NGINX_HOST_PORT']||="9090"
     ENV['VAULT_NAME']||="vault01"
-    ENV['VAULT_IP']||="192.168.2.10"
+    ENV['VAULT_IP']||="192.168.9.10"
     ENV['LEADER_NAME']||="leader01"
-    ENV['LEADER_IP']||="192.168.2.11"
+    ENV['LEADER_IP']||="192.168.9.11"
     ENV['SERVER_COUNT']||="2"
     ENV['DD_API_KEY']||="ONLY REQUIRED FOR DATADOG IMPLEMENTATION"
     
@@ -172,7 +172,7 @@ Vagrant.configure("2") do |config|
     (1..2).each do |i|
         config.vm.define "godev0#{i}" do |devsvr|
             devsvr.vm.hostname = "godev0#{i}"
-            devsvr.vm.network "private_network", ip: "192.168.2.#{100+i*10}"
+            devsvr.vm.network "private_network", ip: "192.168.9.#{100+i*10}"
             devsvr.vm.provision "shell", inline: "/usr/local/bootstrap/scripts/install_nomad.sh", run: "always"
             devsvr.vm.provision "shell", inline: "/usr/local/bootstrap/scripts/install_go_app.sh"
         end

docs/vault/ReadMe.md

@@ -20,8 +20,8 @@ Vault is used here to store the Redis data password that is consumed by both the
 
 **Accessing Vault UI**
 Open a browser on your laptop/host and navigate to http://${LEADER_IP}:8200
-The value for ${LEADER_IP} can be found in the _var.env_ file but typically will default to 192.168.2.11
-_e.g. http://192.168.2.11:8200_
+The value for ${LEADER_IP} can be found in the _var.env_ file but typically will default to 192.168.9.11
+_e.g. http://192.168.9.11:8200_
 The password is set to `reallystrongpassword`
 
 **Storing a Password**

packer/template.json

@@ -8,9 +8,9 @@
     "memory": "512",
     "disk_size": "49600",
     "headless": "true",
-    "iso_checksum": "a2cb36dc010d98ad9253ea5ad5a07fd6b409e3412c48f1860536970b073c98f5",
+    "iso_checksum": "7d8e0055d663bffa27c1718685085626cb59346e7626ba3d3f476322271f573e",
     "iso_checksum_type": "sha256",
-    "iso_url": "http://cdimage.ubuntu.com/ubuntu/releases/bionic/release/ubuntu-18.04.2-server-amd64.iso",
+    "iso_url": "http://cdimage.ubuntu.com/ubuntu/releases/bionic/release/ubuntu-18.04.3-server-amd64.iso",
     "guest_additions_url": "http://download.virtualbox.org/virtualbox/6.0.4/VBoxGuestAdditions_6.0.4.iso",
     "guest_additions_sha256": "749b0c76aa6b588e3310d718fc90ea472fdc0b7c8953f7419c20be7e7fa6584a",
     "ssh_username": "vagrant",

scripts/consul_enable_acls_1.4.sh

@@ -4,8 +4,8 @@ set -x
 setup_environment () {
     source /usr/local/bootstrap/var.env
 
-    IFACE=`route -n | awk '$1 == "192.168.2.0" {print $8;exit}'`
-    CIDR=`ip addr show ${IFACE} | awk '$2 ~ "192.168.2" {print $2}'`
+    IFACE=`route -n | awk '$1 == "192.168.9.0" {print $8;exit}'`
+    CIDR=`ip addr show ${IFACE} | awk '$2 ~ "192.168.9" {print $2}'`
     IP=${CIDR%%/24}
 
     if [ -d /vagrant ]; then

scripts/factorySecretIDTest.sh

@@ -5,8 +5,8 @@ setup_environment () {
 
     source /usr/local/bootstrap/var.env
 
-    IFACE=`route -n | awk '$1 == "192.168.2.0" {print $8}'`
-    CIDR=`ip addr show ${IFACE} | awk '$2 ~ "192.168.2" {print $2}'`
+    IFACE=`route -n | awk '$1 == "192.168.9.0" {print $8}'`
+    CIDR=`ip addr show ${IFACE} | awk '$2 ~ "192.168.9" {print $2}'`
     IP=${CIDR%%/24}
     VAULT_IP=${LEADER_IP}
     FACTORY_IP=${LEADER_IP}

scripts/install_SecretID_Factory.sh

@@ -155,8 +155,8 @@ setup_environment () {
 
     source /usr/local/bootstrap/var.env
 
-    IFACE=`route -n | awk '$1 == "192.168.2.0" {print $8}'`
-    CIDR=`ip addr show ${IFACE} | awk '$2 ~ "192.168.2" {print $2}'`
+    IFACE=`route -n | awk '$1 == "192.168.9.0" {print $8}'`
+    CIDR=`ip addr show ${IFACE} | awk '$2 ~ "192.168.9" {print $2}'`
     IP=${CIDR%%/24}
     VAULT_IP=${LEADER_IP}
 

scripts/install_consul.sh

@@ -93,8 +93,8 @@ setup_environment () {
   sleep 5
   source /usr/local/bootstrap/var.env
 
-  IFACE=`route -n | awk '$1 == "192.168.2.0" {print $8;exit}'`
-  CIDR=`ip addr show ${IFACE} | awk '$2 ~ "192.168.2" {print $2}'`
+  IFACE=`route -n | awk '$1 == "192.168.9.0" {print $8;exit}'`
+  CIDR=`ip addr show ${IFACE} | awk '$2 ~ "192.168.9" {print $2}'`
   IP=${CIDR%%/24}
 
   if [ -d /vagrant ]; then

scripts/install_go_app.sh

@@ -109,8 +109,8 @@ if [ "${TRAVIS}" == "true" ]; then
   IP="127.0.0.1"
   LEADER_IP=${IP}
 else
-  IFACE=`route -n | awk '$1 == "192.168.2.0" {print $8;exit}'`
-  CIDR=`ip addr show ${IFACE} | awk '$2 ~ "192.168.2" {print $2}'`
+  IFACE=`route -n | awk '$1 == "192.168.9.0" {print $8;exit}'`
+  CIDR=`ip addr show ${IFACE} | awk '$2 ~ "192.168.9" {print $2}'`
   IP=${CIDR%%/24}
 fi
 

scripts/install_nomad.sh

@@ -63,8 +63,8 @@ setup_environment () {
 
   source /usr/local/bootstrap/var.env
 
-  IFACE=`route -n | awk '$1 == "192.168.2.0" {print $8;exit}'`
-  CIDR=`ip addr show ${IFACE} | awk '$2 ~ "192.168.2" {print $2}'`
+  IFACE=`route -n | awk '$1 == "192.168.9.0" {print $8;exit}'`
+  CIDR=`ip addr show ${IFACE} | awk '$2 ~ "192.168.9" {print $2}'`
   IP=${CIDR%%/24}
 
   # Configure Nomad client.hcl file
@@ -133,7 +133,7 @@ install_nomad() {
   else
 
     NOMAD_ADDR=http://${IP}:4646 /usr/local/bin/nomad agent-info 2>/dev/null || {
-      create_service nomad "HashiCorp's Nomad Agent - A Modern Platform and Cloud Agnostic Scheduler" "/usr/local/bin/nomad agent -log-level=DEBUG -client -bind=${IP} -data-dir=/usr/local/nomad -join=192.168.2.11 -config=/etc/nomad.d"
+      create_service nomad "HashiCorp's Nomad Agent - A Modern Platform and Cloud Agnostic Scheduler" "/usr/local/bin/nomad agent -log-level=DEBUG -client -bind=${IP} -data-dir=/usr/local/nomad -join=192.168.9.11 -config=/etc/nomad.d"
       sudo usermod -a -G consulcerts nomad
       cp -apr /usr/local/bootstrap/conf/nomad.d /etc
       sudo systemctl start nomad

scripts/install_redis.sh

@@ -93,8 +93,8 @@ setup_environment () {
   source /usr/local/bootstrap/var.env
   echo 'Start Setup of Redis Deployment Environment'
 
-  IFACE=`route -n | awk '$1 == "192.168.2.0" {print $8;exit}'`
-  CIDR=`ip addr show ${IFACE} | awk '$2 ~ "192.168.2" {print $2}'`
+  IFACE=`route -n | awk '$1 == "192.168.9.0" {print $8;exit}'`
+  CIDR=`ip addr show ${IFACE} | awk '$2 ~ "192.168.9" {print $2}'`
   IP=${CIDR%%/24}
 
   if [ -d /vagrant ]; then

scripts/install_vault.sh

@@ -63,8 +63,8 @@ setup_environment () {
     echo 'Start Setup of Vault Environment'
     source /usr/local/bootstrap/var.env
 
-    IFACE=`route -n | awk '$1 == "192.168.2.0" {print $8}'`
-    CIDR=`ip addr show ${IFACE} | awk '$2 ~ "192.168.2" {print $2}'`
+    IFACE=`route -n | awk '$1 == "192.168.9.0" {print $8}'`
+    CIDR=`ip addr show ${IFACE} | awk '$2 ~ "192.168.9" {print $2}'`
     IP=${CIDR%%/24}
 
     if [ -d /vagrant ]; then

scripts/install_webserver.sh

@@ -4,8 +4,8 @@ set -x
 source /usr/local/bootstrap/var.env
 
 echo 'Start Setup of Webtier Deployment Environment'
-IFACE=`route -n | awk '$1 == "192.168.2.0" {print $8}'`
-CIDR=`ip addr show ${IFACE} | awk '$2 ~ "192.168.2" {print $2}'`
+IFACE=`route -n | awk '$1 == "192.168.9.0" {print $8}'`
+CIDR=`ip addr show ${IFACE} | awk '$2 ~ "192.168.9" {print $2}'`
 IP=${CIDR%%/24}
 
 if [ "${TRAVIS}" == "true" ]; then

scripts/nomad_job.hcl

@@ -8,7 +8,7 @@ job "webpagecounter" {
         driver = "raw_exec"
         config {
             command = "/usr/local/bin/webcounter"
-            args = ["-port=${NOMAD_PORT_http}", "-ip=0.0.0.0", "-consulACL=d4c5c168-a94b-93c7-51fd-db7fa954b609", "-consulIp=192.168.2.120:8321"]
+            args = ["-port=${NOMAD_PORT_http}", "-ip=0.0.0.0", "-consulACL=9f37fc6c-1170-cae3-7d0d-00ca347255de", "-consulIp=192.168.9.120:8321"]
         }
         resources {
           cpu    = 20

scripts/packer_install_base_packages.sh

@@ -1,15 +1,16 @@
 #!/usr/bin/env bash
 
-# TODO: Move all versions upto to here for easier mgmt
-consul_version=1.4.4
-vault_version=1.1.0
-nomad_version=0.9.0-rc1
-terraform_version=0.12.0-beta1
-consul_template_version=0.20.0
-env_consul_version=0.7.3
-golang_version=1.12.1
+# Binary versions to check for
+consul_version=1.6.0
+vault_version=1.2.2
+nomad_version=0.9.5
+terraform_version=0.12.8
+consul_template_version=0.21.3
+env_consul_version=0.9.0
+golang_version=1.13
 inspec_package_url=https://packages.chef.io/files/stable/inspec/3.9.0/ubuntu/18.04/inspec_3.9.0-1_amd64.deb
 inspec_package=${inspec_package_url##/*/}
+# TODO: Add checksums to ensure integrity of binaries downloaded
 
 install_hashicorp_binaries () {
 
@@ -126,6 +127,7 @@ which /usr/local/go &>/dev/null || {
     [ -f go${golang_version}.linux-amd64.tar.gz ] || {
         wget -qnv https://dl.google.com/go/go${golang_version}.linux-amd64.tar.gz
     }
+
     tar -C /usr/local -xzf go${golang_version}.linux-amd64.tar.gz
     popd
     rm -rf /tmp/go_src

scripts/updateBackendCount.sh

@@ -7,7 +7,7 @@ text="A number of backend servers have happened"
 echo -n "_e{${#title},${#text}}:${title}|${text}|#web"  >/dev/udp/127.0.0.1/8125
 
 #update number of backend service
-metric=`grep '192.168.2' /etc/nginx/conf.d/goapp.conf | wc -l`
+metric=`grep '192.168.9' /etc/nginx/conf.d/goapp.conf | wc -l`
 name="WebCounterServiceTotal"
 echo -n "${name}:${metric}|g|#web" >/dev/udp/127.0.0.1/8125
 

terraform/terraform_azure.tf

@@ -23,7 +23,7 @@ resource "azurerm_subnet" "webpagecountersubnet" {
     name                 = "wpcSubnet"
     resource_group_name  = "${var.arm_resource_group}"
     virtual_network_name = "${azurerm_virtual_network.webpagecounternetwork.name}"
-    address_prefix       = "192.168.2.0/24"
+    address_prefix       = "192.168.9.0/24"
 }
 
 # Create public IP for leader01
@@ -225,7 +225,7 @@ resource "azurerm_network_interface" "wpcnic" {
         name                          = "wpcNicConfiguration"
         subnet_id                     = "${azurerm_subnet.webpagecountersubnet.id}"
         private_ip_address_allocation = "Static"
-        private_ip_address            = "${cidrhost("192.168.2.0/24", 11)}"
+        private_ip_address            = "${cidrhost("192.168.9.0/24", 11)}"
         public_ip_address_id          = "${azurerm_public_ip.leader01publicip.id}"
     }
 
@@ -245,7 +245,7 @@ resource "azurerm_network_interface" "wpcproxynic" {
         name                          = "wpcproxyNicConfiguration"
         subnet_id                     = "${azurerm_subnet.webpagecountersubnet.id}"
         private_ip_address_allocation = "Static"
-        private_ip_address            = "${cidrhost("192.168.2.0/24", 250)}"
+        private_ip_address            = "${cidrhost("192.168.9.0/24", 250)}"
         public_ip_address_id          = "${azurerm_public_ip.wpcpublicipproxy.id}"
     }
 
@@ -265,7 +265,7 @@ resource "azurerm_network_interface" "wpcredisnic" {
         name                          = "wpcredisNicConfiguration"
         subnet_id                     = "${azurerm_subnet.webpagecountersubnet.id}"
         private_ip_address_allocation = "Static"
-        private_ip_address            = "${cidrhost("192.168.2.0/24", 200)}"
+        private_ip_address            = "${cidrhost("192.168.9.0/24", 200)}"
     }
 
     tags {
@@ -284,7 +284,7 @@ resource "azurerm_network_interface" "wpcgodev01nic" {
         name                          = "wpcgodev01NicConfiguration"
         subnet_id                     = "${azurerm_subnet.webpagecountersubnet.id}"
         private_ip_address_allocation = "Static"
-        private_ip_address            = "${cidrhost("192.168.2.0/24", 110)}"
+        private_ip_address            = "${cidrhost("192.168.9.0/24", 110)}"
     }
 
     tags {
@@ -303,7 +303,7 @@ resource "azurerm_network_interface" "wpcgodev02nic" {
         name                          = "wpcgodev02NicConfiguration"
         subnet_id                     = "${azurerm_subnet.webpagecountersubnet.id}"
         private_ip_address_allocation = "Static"
-        private_ip_address            = "${cidrhost("192.168.2.0/24", 120)}"
+        private_ip_address            = "${cidrhost("192.168.9.0/24", 120)}"
     }
 
     tags {