From 86f4d8095df51a395a489aaecc14f355348ec1bd Mon Sep 17 00:00:00 2001 From: Marica Antonacci Date: Wed, 6 Sep 2017 13:48:41 +0000 Subject: [PATCH] Workaround for https://github.com/indigo-dc/orchestrator/issues/221 --- artifacts/mesos/spark_mesos_setup.yml | 2 ++ custom_types.yaml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/artifacts/mesos/spark_mesos_setup.yml b/artifacts/mesos/spark_mesos_setup.yml index 562d785b..c525ff98 100644 --- a/artifacts/mesos/spark_mesos_setup.yml +++ b/artifacts/mesos/spark_mesos_setup.yml @@ -4,5 +4,7 @@ pre_tasks: - set_fact: spark_mesos_executor_memory="{{ spark_mesos_executor_mem | regex_replace(' +(.*)B', '\\1') | lower() }}" - set_fact: spark_mesos_driver_memory="{{ spark_mesos_driver_mem | regex_replace(' +(.*)B', '\\1') | lower() }}" + - set_fact: spark_mesos_hdfs_uri="{{ (spark_hdfs_uri == 'None' ) | ternary('', spark_hdfs_uri) }}" + - set_fact: spark_mesos_swift_auth_url="{{ (spark_swift_auth_url == 'None' ) | ternary('', spark_swift_auth_url) }}" roles: - role: indigo-dc.spark-mesos diff --git a/custom_types.yaml b/custom_types.yaml index 8858b2db..a7309f5d 100644 --- a/custom_types.yaml +++ b/custom_types.yaml @@ -1287,12 +1287,12 @@ node_types: interfaces: Standard: create: - implementation: https://raw.githubusercontent.com/indigo-dc/tosca-types/master/artifacts/mesos/spark_mesos_setup.yml + implementation: https://raw.githubusercontent.com/indigo-dc/tosca-types/fix_spark_default_values/artifacts/mesos/spark_mesos_setup.yml inputs: marathon_password: { get_property: [ SELF, marathon_password ] } zookeeper_peers: { get_property: [ SELF, zookeeper_peers ] } - spark_mesos_hdfs_uri: { get_property: [ SELF, spark_hdfs_uri ] } - spark_mesos_swift_auth_url: { get_property: [ SELF, spark_swift_auth_url ] } + spark_hdfs_uri: { get_property: [ SELF, spark_hdfs_uri ] } + spark_swift_auth_url: { get_property: [ SELF, spark_swift_auth_url ] } spark_mesos_swift_http_port: { get_property: [ SELF, spark_swift_http_port ] } spark_mesos_swift_region: { get_property: [ SELF, spark_swift_region ] } spark_mesos_swift_tenant: { get_property: [ SELF, spark_swift_tenant ] }