Merge pull request #32 from ibm-cloud-architecture/integration

EE Tests

Author: jesusmah

.circleci/config.yml

@@ -106,4 +106,9 @@ workflows:
           requires:
             - ce-ubuntu
           tfvarsfile: terraform-icp-ce-rhel-example.tfvars
+      - build:
+          name: ee-rhel
+          requires:
+            - ce-rhel
+          tfvarsfile: terraform-icp-ee-rhel-example.tfvars
       # Repeated as many times as there are configurations...

scripts/bootstrap.sh

@@ -70,7 +70,7 @@ docker_install() {
     then
       # Figure out what we should name the file
       filename="icp-docker.bin"
-      /usr/local/bin/aws s3 cp ${docker_installer} ${sourcedir}/${filename}
+      /usr/local/bin/aws s3 cp ${docker_installer} ${sourcedir}/${filename} --no-progress
       package_file="${sourcedir}/${filename}"
     fi
 

scripts/start_install.sh

@@ -64,7 +64,7 @@ if [[ ! -z "${image_location}" ]]; then
   if [[ "${image_location:0:2}" == "s3" ]]; then
     # stream it right out of s3 into docker
     logmsg "Copying binary package from ${image_location} ..."
-    ${awscli} s3 cp ${image_location} /tmp
+    ${awscli} s3 cp ${image_location} /tmp --no-progress
 
     logmsg "Loading docker images from /tmp/`basename ${image_location}` ..."
     tar zxf /tmp/`basename ${image_location}` -O | docker load | tee -a $logfile
@@ -103,7 +103,7 @@ instretval=$?
 
 # backup the config
 logmsg "Backing up the config to the S3 bucket."
-${awscli} s3 sync /opt/ibm/cluster s3://${s3_config_bucket}
+${awscli} s3 sync /opt/ibm/cluster s3://${s3_config_bucket} --no-progress
 
 logmsg "~~~~~~~~ Completed ICP installation Code ~~~~~~~~"
 # Ensure the script exits with the exit code of the ICP installer

terraform-icp-ee-rhel-example.tfvars

@@ -0,0 +1,15 @@
+## You must set a key file name to be able to ssh to any of the created VMs
+# key_name = "<name of your ssh key>"
+
+image_location = "s3://icp-docker-tarball/ibm-cloud-private-x86_64-3.2.0.tar.gz"
+
+ami = "rhel"         # Use RHEL and supply docker package
+docker_package_location = "s3://icp-docker-binaries/icp-docker-18.03.1_x86_64.bin"
+
+icp_inception_image = "ibmcom/icp-inception-amd64:3.2.0-ee"
+
+# We add the bastion host so we can monitor the progress
+# during ICP Installation
+bastion = {
+ nodes = "1"
+}