Merge pull request #698 from StackStorm/setup-redis

Add redis to install scripts

Author: m4dcoder

.circle/docker-compose.sh

@@ -11,7 +11,7 @@ set -e
 # Source the build environment defintion (details in buildenv.sh)
 . ~/.buildenv
 
-# Used for `RABBITMQHOST` `MONGODBHOST`, see docker-compose.override.yml
+# Used for `RABBITMQHOST`, `MONGODBHOST`, and `REDISHOST` see docker-compose.override.yml
 HOST_IP=$(ifconfig docker0 | grep 'inet addr' | awk -F: '{print $2}' | awk '{print $1}')
 
 set -x
@@ -26,6 +26,7 @@ case "$1" in
         -e ST2PKG_RELEASE=${ST2PKG_RELEASE} \
         -e RABBITMQHOST=${HOST_IP} \
         -e MONGODBHOST=${HOST_IP} \
+        -e REDISHOST=${HOST_IP} \
         -e ST2_CIRCLE_URL=${CIRCLE_BUILD_URL} \
         $2 /bin/true
   ;;
@@ -38,6 +39,7 @@ case "$1" in
         -e ST2PKG_RELEASE=${ST2PKG_RELEASE} \
         -e RABBITMQHOST=${HOST_IP} \
         -e MONGODBHOST=${HOST_IP} \
+        -e REDISHOST=${HOST_IP} \
         -e ST2_PACKAGES="${ST2_PACKAGES}" \
         -e ST2_CIRCLE_URL=${CIRCLE_BUILD_URL} \
         $2 build
@@ -52,6 +54,7 @@ case "$1" in
         -e ST2PKG_RELEASE=${ST2PKG_RELEASE} \
         -e RABBITMQHOST=${HOST_IP} \
         -e MONGODBHOST=${HOST_IP} \
+        -e REDISHOST=${HOST_IP} \
         -e ST2_PACKAGES="${ST2_PACKAGES}" \
         -e ST2_CIRCLE_URL=${CIRCLE_BUILD_URL} \
         $2 test

docker-compose.circle.yml

@@ -24,6 +24,7 @@ bionic:
     - bionictest
     - rabbitmq
     - mongodb
+    - redis
 
 el8:
   image: quay.io/stackstorm/packagingrunner
@@ -39,6 +40,7 @@ el8:
     - centos8test
     - rabbitmq
     - mongodb
+    - redis
 
 el7:
   image: quay.io/stackstorm/packagingrunner

docker-compose.circle2.yml

@@ -11,6 +11,7 @@ xenial:
     - xenialtest
     - rabbitmq
     - mongodb
+    - redis
 
 bionic:
   image: quay.io/stackstorm/packagingrunner
@@ -26,6 +27,7 @@ bionic:
     - bionictest
     - rabbitmq
     - mongodb
+    - redis
 
 el8:
   image: quay.io/stackstorm/packagingrunner
@@ -40,6 +42,7 @@ el8:
     - centos8test
     - rabbitmq
     - mongodb
+    - redis
 
 el7:
   image: quay.io/stackstorm/packagingrunner
@@ -54,6 +57,7 @@ el7:
     - centos7test
     - rabbitmq
     - mongodb
+    - redis
 
 ## Package build nodes
 #

docker-compose.override.yml

@@ -48,3 +48,8 @@ mongodb:
   image: mongo:4.0
   ports:
     - "27017:27017"
+
+redis:
+  image: redis:latest
+  ports:
+    - "6379:6379"

docker-compose.yml

@@ -11,6 +11,7 @@ xenial:
     - xenialtest
     - rabbitmq
     - mongodb
+    - redis
 
 bionic:
   image: quay.io/stackstorm/packagingrunner
@@ -26,6 +27,7 @@ bionic:
     - bionictest
     - rabbitmq
     - mongodb
+    - redis
 
 el8:
   image: quay.io/stackstorm/packagingrunner
@@ -41,7 +43,7 @@ el8:
     - centos8test
     - rabbitmq
     - mongodb
-
+    - redis
 
 el7:
   image: quay.io/stackstorm/packagingrunner
@@ -56,6 +58,7 @@ el7:
     - centos7test
     - rabbitmq
     - mongodb
+    - redis
 
 ## Package build nodes
 #

rake/build/environment.rb

@@ -58,6 +58,7 @@
   # Default hostnames of dependat services (the value can take an address also)
   envpass :rabbitmqhost, 'rabbitmq', proc: convert_to_ipaddr
   envpass :mongodbhost,  'mongodb',  proc: convert_to_ipaddr
+  envpass :redishost,  'redis',  proc: convert_to_ipaddr
 
   # upload_sources - a list of directories which should be propogated
   #                  to remote nodes.

rake/spec/default/60-st2_all-services-ok_spec.rb

@@ -15,6 +15,11 @@
     it { is_expected.to be_reachable.with :port => 27017, :timeout => 1 }
   end
 
+  describe 'redis' do
+    subject { host(spec[:redishost]) }
+    it { is_expected.to be_reachable.with :port => 6379, :timeout => 1 }
+  end
+
 end
 
 describe 'start st2 components and services' do

rake/spec/spec_helper.rb

@@ -31,6 +31,7 @@ class ST2Spec
     package_list: pipeopts.packages,
     rabbitmqhost: pipeopts.rabbitmqhost,
     mongodbhost:  pipeopts.mongodbhost,
+    redishost: pipeopts.redishost,
     loglines_to_show: 100,
     logdest_pattern: {
       st2actionrunner: 'st2actionrunner.{pid}'

scripts/generate_st2_config.sh

@@ -8,6 +8,7 @@ set -e
 # --- Go!
 MONGOHOST="${MONGODBHOST:-mongodb}"
 RABBITMQHOST="${RABBITMQHOST:-rabbitmq}"
+REDISHOST="${REDISHOST:-redis}"
 
 CONF=/etc/st2/st2.conf
 AMQP="amqp://guest:guest@$RABBITMQHOST:5672/"
@@ -20,6 +21,7 @@ EHD
 # Don't join into one cmd with previous, otherwise it becomes
 # non-interactive waiting ^D.
 MONGO=$(echo "$MONGO" | sed -r 's/^\s+//')
+REDIS="redis://${REDISHOST}:6379"
 
 # Specify rabbitmq host
 sed -i "/\[messaging\]/,/\[.*\]\|url/ {n; s#url.*=.*#url = $AMQP#}" $CONF
@@ -28,4 +30,7 @@ sed -i "/\[auth\]/,/\[.*\]\|enable/ {n; s#enable.*=.*#enable = False#}" $CONF
 # Create database section, st2.conf ships without it
 (grep "\[database\]" $CONF &>/dev/null) || echo "$MONGO" >> /etc/st2/st2.conf
 
+# Specify redis host
+sed -i "/\[coordination\]/,/\[.*\]\|url/ {n; s#url.*=.*#url = $REDIS#}" $CONF
+
 echo  "Resulting $CONF >>>" "$(cat $CONF)"

scripts/includes/common.sh

@@ -83,9 +83,10 @@ check_st2_host_dependencies() {
   # CHECK 1: Determine which, if any, of the required ports are used by an existing process.
 
   # Abort the installation early if the following ports are being used by an existing process.
-  # nginx (80, 443), mongodb (27017), rabbitmq (4369, 5672, 25672), and st2 (9100-9102).
+  # nginx (80, 443), mongodb (27017), rabbitmq (4369, 5672, 25672), redis (6379)
+  # and st2 (9100-9102).
 
-  declare -a ports=("80" "443" "4369" "5672" "9100" "9101" "9102" "25672" "27017")
+  declare -a ports=("80" "443" "4369" "5672" "6379" "9100" "9101" "9102" "25672" "27017")
   declare -a used=()
 
   for i in "${ports[@]}"