Merge pull request #176 in ASAPO/asapo from update_nomad to develop

* commit '576d7840':
  update versions

deploy/nomad_consul_package/CMakeLists.txt

@@ -4,10 +4,14 @@ PROJECT(ASAPO_HA)
 
 add_subdirectory (Packages)
 
+set (CONSUL_VERSION 1.10.3)
+set (NOMAD_VERSION 1.1.6)
+set (TERRAFORM_VERSION 1.0.8)
+
 INCLUDE(ExternalProject)
 ExternalProject_Add(
         consul
-        URL https://releases.hashicorp.com/consul/1.7.3/consul_1.7.3_linux_amd64.zip
+        URL https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip
         PATCH_COMMAND ""
         CONFIGURE_COMMAND ""
         CMAKE_COMMAND ""
@@ -18,7 +22,7 @@ ExternalProject_Add(
 
 ExternalProject_Add(
         nomad
-        URL https://releases.hashicorp.com/nomad/0.11.3/nomad_0.11.3_linux_amd64.zip
+        URL https://releases.hashicorp.com/nomad/${NOMAD_VERSION}/nomad_${NOMAD_VERSION}_linux_amd64.zip
         PATCH_COMMAND ""
         CONFIGURE_COMMAND ""
         CMAKE_COMMAND ""
@@ -29,7 +33,7 @@ ExternalProject_Add(
 
 ExternalProject_Add(
         terraform
-        URL https://releases.hashicorp.com/terraform/0.12.26/terraform_0.12.26_linux_amd64.zip
+        URL https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip
         PATCH_COMMAND ""
         CONFIGURE_COMMAND ""
         CMAKE_COMMAND ""

deploy/nomad_consul_package/Packages/CMakeLists.txt

@@ -13,8 +13,8 @@ SET(CPACK_PACKAGE_ARCHITECTURE "amd64")
 SET(CPACK_PACKAGE_NAME "asapo-ha")
 SET(CPACK_PACKAGE_VENDOR "DESY")
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
-SET(CPACK_PACKAGE_VERSION_MINOR "7")
-SET(CPACK_PACKAGE_VERSION_PATCH "3")
+SET(CPACK_PACKAGE_VERSION_MINOR "8")
+SET(CPACK_PACKAGE_VERSION_PATCH "0")
 
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Nomad and Consul for Asapo Debian package")