Merge branch 'devel'

occopus · Nov 10, 2020 · 3321098 · 3321098
2 parents 961722b + aae990e
commit 3321098
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 8 deletions.
diff --git a/tutorials/spark-cluster-with-python.tar.gz b/tutorials/spark-cluster-with-python.tar.gz
diff --git a/tutorials/spark-cluster-with-python/infra-spark-cluster.yaml b/tutorials/spark-cluster-with-python/infra-spark-cluster.yaml
@@ -9,7 +9,7 @@ nodes:
     name: spark-worker
     type: spark_worker_node
     scaling:
-      min: 1
+      min: 2
       max: 10
 
 dependencies:

diff --git a/tutorials/spark-cluster-with-python/nodes/cloud_init_spark_master.yaml b/tutorials/spark-cluster-with-python/nodes/cloud_init_spark_master.yaml
@@ -9,7 +9,7 @@ write_files:
     #!/bin/bash
 
     set -ex
-    HADOOP_VERSION=2.10.0
+    HADOOP_VERSION=2.10.1
     SPARK_VERSION=2.4.6
     SPAR_HADOOP_VERSION=2.7
     CONSUL_VERSION=1.8.0

diff --git a/tutorials/spark-cluster-with-python/nodes/cloud_init_spark_worker.yaml b/tutorials/spark-cluster-with-python/nodes/cloud_init_spark_worker.yaml
@@ -9,7 +9,7 @@ write_files:
     #!/bin/bash
 
     set -ex
-    HADOOP_VERSION=2.10.0
+    HADOOP_VERSION=2.10.1
     SPARK_VERSION=2.4.6
     SPAR_HADOOP_VERSION=2.7
     CONSUL_VERSION=1.8.0

diff --git a/tutorials/spark-cluster-with-python/nodes/node_definitions.yaml b/tutorials/spark-cluster-with-python/nodes/node_definitions.yaml
@@ -11,7 +11,7 @@
       key_name: 
       security_groups:
         -
-          
+
       floating_ip: yes
     contextualisation:
       type: cloudinit
@@ -35,7 +35,7 @@
       key_name: 
       security_groups:
         -
-          
+
       # floating_ip: yes # If needed
     contextualisation:
       type: cloudinit

diff --git a/tutorials/spark-cluster-with-r.tar.gz b/tutorials/spark-cluster-with-r.tar.gz
diff --git a/tutorials/spark-cluster-with-r/infra-spark-cluster.yaml b/tutorials/spark-cluster-with-r/infra-spark-cluster.yaml
@@ -8,7 +8,7 @@ nodes:
   - &W
     name: spark-worker
     type: spark_worker_node
-    scaling: 
+    scaling:
       min: 2
       max: 10
 

diff --git a/tutorials/spark-cluster-with-r/nodes/cloud_init_spark_master.yaml b/tutorials/spark-cluster-with-r/nodes/cloud_init_spark_master.yaml
@@ -9,7 +9,7 @@ write_files:
     #!/bin/bash
 
     set -ex
-    HADOOP_VERSION=2.10.0
+    HADOOP_VERSION=2.10.1
     SPARK_VERSION=2.4.6
     SPAR_HADOOP_VERSION=2.7
     CONSUL_VERSION=1.8.0

diff --git a/tutorials/spark-cluster-with-r/nodes/cloud_init_spark_worker.yaml b/tutorials/spark-cluster-with-r/nodes/cloud_init_spark_worker.yaml
@@ -9,7 +9,7 @@ write_files:
     #!/bin/bash
 
     set -ex
-    HADOOP_VERSION=2.10.0
+    HADOOP_VERSION=2.10.1
     SPARK_VERSION=2.4.6
     SPAR_HADOOP_VERSION=2.7
     CONSUL_VERSION=1.8.0