Repository: incubator-airflow
Updated Branches:
refs/heads/master bf1296fbd -> 556c9ec5b
[AIRFLOW-2094] Jinjafied project_id, region & zone in DataProc{*} Operators
- Minor docstring change
- Jinjafied project_id, region & zone in
DataProc{*} Operators to allow using Airflow
variables
Closes #3027 from kaxil/patch-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/556c9ec5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/556c9ec5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/556c9ec5
Branch: refs/heads/master
Commit: 556c9ec5ba12973cc0335cd18d375227797ec62f
Parents: bf1296f
Author: Kaxil Naik <[email protected]>
Authored: Fri Feb 9 20:56:53 2018 +0100
Committer: Bolke de Bruin <[email protected]>
Committed: Fri Feb 9 20:56:53 2018 +0100
----------------------------------------------------------------------
airflow/contrib/operators/dataproc_operator.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/556c9ec5/airflow/contrib/operators/dataproc_operator.py
----------------------------------------------------------------------
diff --git a/airflow/contrib/operators/dataproc_operator.py
b/airflow/contrib/operators/dataproc_operator.py
index 3444cc6..ebcc402 100644
--- a/airflow/contrib/operators/dataproc_operator.py
+++ b/airflow/contrib/operators/dataproc_operator.py
@@ -64,7 +64,7 @@ class DataprocClusterCreateOperator(BaseOperator):
:type master_machine_type: string
:param master_disk_size: Disk size for the master node
:type master_disk_size: int
- :param worker_machine_type:Compute engine machine type to use for the
worker nodes
+ :param worker_machine_type: Compute engine machine type to use for the
worker nodes
:type worker_machine_type: string
:param worker_disk_size: Disk size for the worker nodes
:type worker_disk_size: int
@@ -95,7 +95,7 @@ class DataprocClusterCreateOperator(BaseOperator):
:type service_account_scopes: list[string]
"""
- template_fields = ['cluster_name']
+ template_fields = ['cluster_name', 'project_id', 'zone', 'region']
@apply_defaults
def __init__(self,
@@ -339,7 +339,7 @@ class DataprocClusterDeleteOperator(BaseOperator):
:type delegate_to: string
"""
- template_fields = ['cluster_name']
+ template_fields = ['cluster_name', 'project_id', 'region']
@apply_defaults
def __init__(self,
