From c3d147f507e81455ae467f8aa589972af3449f77 Mon Sep 17 00:00:00 2001 From: illustris Date: Tue, 2 Nov 2021 21:46:48 +0530 Subject: nixos/hadoop: replace "enabled" options with "enable" options The module has been using "enabled" in place of enable since init ( 0c10b2baa6bf61c8ddaed7cdb6c2f2dbaab42662 ) --- nixos/modules/services/cluster/hadoop/hdfs.nix | 24 ++++++++++++------------ nixos/modules/services/cluster/hadoop/yarn.nix | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'nixos/modules/services') diff --git a/nixos/modules/services/cluster/hadoop/hdfs.nix b/nixos/modules/services/cluster/hadoop/hdfs.nix index 11b855b0c71..e2cd8bc6fba 100644 --- a/nixos/modules/services/cluster/hadoop/hdfs.nix +++ b/nixos/modules/services/cluster/hadoop/hdfs.nix @@ -17,7 +17,7 @@ in { options.services.hadoop.hdfs = { namenode = { - enabled = mkOption { + enable = mkOption { type = types.bool; default = false; description = '' @@ -43,7 +43,7 @@ in }; }; datanode = { - enabled = mkOption { + enable = mkOption { type = types.bool; default = false; description = '' @@ -60,7 +60,7 @@ in }; }; journalnode = { - enabled = mkOption { + enable = mkOption { type = types.bool; default = false; description = '' @@ -77,7 +77,7 @@ in }; }; zkfc = { - enabled = mkOption { + enable = mkOption { type = types.bool; default = false; description = '' @@ -87,7 +87,7 @@ in inherit restartIfChanged; }; httpfs = { - enabled = mkOption { + enable = mkOption { type = types.bool; default = false; description = '' @@ -106,7 +106,7 @@ in }; config = mkMerge [ - (mkIf cfg.hdfs.namenode.enabled { + (mkIf cfg.hdfs.namenode.enable { systemd.services.hdfs-namenode = { description = "Hadoop HDFS NameNode"; wantedBy = [ "multi-user.target" ]; @@ -130,7 +130,7 @@ in 8022 # namenode. servicerpc-address ]); }) - (mkIf cfg.hdfs.datanode.enabled { + (mkIf cfg.hdfs.datanode.enable { systemd.services.hdfs-datanode = { description = "Hadoop HDFS DataNode"; wantedBy = [ "multi-user.target" ]; @@ -150,7 +150,7 @@ in 9867 # datanode.ipc.address ]); }) - (mkIf cfg.hdfs.journalnode.enabled { + (mkIf cfg.hdfs.journalnode.enable { systemd.services.hdfs-journalnode = { description = "Hadoop HDFS JournalNode"; wantedBy = [ "multi-user.target" ]; @@ -169,7 +169,7 @@ in 8485 # dfs.journalnode.rpc-address ]); }) - (mkIf cfg.hdfs.zkfc.enabled { + (mkIf cfg.hdfs.zkfc.enable { systemd.services.hdfs-zkfc = { description = "Hadoop HDFS ZooKeeper failover controller"; wantedBy = [ "multi-user.target" ]; @@ -183,7 +183,7 @@ in }; }; }) - (mkIf cfg.hdfs.httpfs.enabled { + (mkIf cfg.hdfs.httpfs.enable { systemd.services.hdfs-httpfs = { description = "Hadoop httpfs"; wantedBy = [ "multi-user.target" ]; @@ -209,7 +209,7 @@ in ]); }) (mkIf ( - cfg.hdfs.namenode.enabled || cfg.hdfs.datanode.enabled || cfg.hdfs.journalnode.enabled || cfg.hdfs.zkfc.enabled + cfg.hdfs.namenode.enable || cfg.hdfs.datanode.enable || cfg.hdfs.journalnode.enable || cfg.hdfs.zkfc.enable ) { users.users.hdfs = { description = "Hadoop HDFS user"; @@ -217,7 +217,7 @@ in uid = config.ids.uids.hdfs; }; }) - (mkIf cfg.hdfs.httpfs.enabled { + (mkIf cfg.hdfs.httpfs.enable { users.users.httpfs = { description = "Hadoop HTTPFS user"; group = "hadoop"; diff --git a/nixos/modules/services/cluster/hadoop/yarn.nix b/nixos/modules/services/cluster/hadoop/yarn.nix index 3d27ad8b109..b6d4dbe25c0 100644 --- a/nixos/modules/services/cluster/hadoop/yarn.nix +++ b/nixos/modules/services/cluster/hadoop/yarn.nix @@ -17,7 +17,7 @@ in { options.services.hadoop.yarn = { resourcemanager = { - enabled = mkOption { + enable = mkOption { type = types.bool; default = false; description = '' @@ -34,7 +34,7 @@ in }; }; nodemanager = { - enabled = mkOption { + enable = mkOption { type = types.bool; default = false; description = '' @@ -62,7 +62,7 @@ in config = mkMerge [ (mkIf ( - cfg.yarn.resourcemanager.enabled || cfg.yarn.nodemanager.enabled + cfg.yarn.resourcemanager.enable || cfg.yarn.nodemanager.enable ) { users.users.yarn = { @@ -72,7 +72,7 @@ in }; }) - (mkIf cfg.yarn.resourcemanager.enabled { + (mkIf cfg.yarn.resourcemanager.enable { systemd.services.yarn-resourcemanager = { description = "Hadoop YARN ResourceManager"; wantedBy = [ "multi-user.target" ]; @@ -95,7 +95,7 @@ in ]); }) - (mkIf cfg.yarn.nodemanager.enabled { + (mkIf cfg.yarn.nodemanager.enable { # Needed because yarn hardcodes /bin/bash in container start scripts # These scripts can't be patched, they are generated at runtime systemd.tmpfiles.rules = [ -- cgit 1.4.1