diff --git a/lib/refrepo/gen/oar-properties.rb b/lib/refrepo/gen/oar-properties.rb
index 1e16f1a10f119c4e588e93c37ea4c2a49e551197..e486f04d35f04eec56d641daf1be6fb7e72034d4 100644
--- a/lib/refrepo/gen/oar-properties.rb
+++ b/lib/refrepo/gen/oar-properties.rb
@@ -733,7 +733,7 @@ def ignore_default_keys()
     "gpu", # New property taken into account by the new generator
     "cpuset",
     "desktop_computing",
-    "deploy",
+    # "deploy",
     "drain",
     "expiry_date",
     "finaud_decision",
diff --git a/spec/oar_properties_spec.rb b/spec/oar_properties_spec.rb
index ae9c3ef40b698bdb4b7295648f1166ddd9e519c3..9eb0c9785479e43eae0137a01bb323ea146cbe59 100644
--- a/spec/oar_properties_spec.rb
+++ b/spec/oar_properties_spec.rb
@@ -222,7 +222,7 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -p host='clustera-2.fakes
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 TXT
       expected_clustera3_cmds = <<-TXT
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 TXT
 
       generator_output = capture do
@@ -262,6 +262,7 @@ TXT
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
     ["+", "cputype", "Intel Xeon Silver 4110"]
+    ["+", "deploy", "YES"]
     ["+", "disk_reservation_count", 0]
     ["+", "disktype", "SATA"]
     ["+", "eth_count", 1]
@@ -299,6 +300,7 @@ TXT
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
     ["+", "cputype", "Intel Xeon Silver 4110"]
+    ["+", "deploy", "YES"]
     ["+", "disk_reservation_count", 0]
     ["+", "disktype", "SATA"]
     ["+", "eth_count", 1]
@@ -443,7 +445,7 @@ oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21
 TXT
 
       expected_clustera3_cmds = <<-TXT
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 TXT
 
       generator_output = capture do
@@ -650,7 +652,7 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -p host='clustera-2.fakes
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
       TXT
       expected_clustera3_cmds = <<-TXT
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
       TXT
 
       generator_output = capture do
@@ -690,6 +692,7 @@ oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'"
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
     ["+", "cputype", "Intel Xeon Silver 4110"]
+    ["+", "deploy", "YES"]
     ["+", "disk_reservation_count", 0]
     ["+", "disktype", "SATA"]
     ["+", "eth_count", 1]
@@ -727,6 +730,7 @@ oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'"
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
     ["+", "cputype", "Intel Xeon Silver 4110"]
+    ["+", "deploy", "YES"]
     ["+", "disk_reservation_count", 0]
     ["+", "disktype", "SATA"]
     ["+", "eth_count", 1]
@@ -872,7 +876,7 @@ oarnodesetting -a -h 'clusterb-2.fakesite.grid5000.fr' -p host='clusterb-2.fakes
 TXT
 
       expected_clusterb3_cmds = <<-TXT
-oarnodesetting --sql "host='clusterb-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
+oarnodesetting --sql "host='clusterb-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
 TXT
 
       expected_clusterb4_cmds = <<-TXT
@@ -923,6 +927,7 @@ TXT
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
     ["+", "cputype", "Intel Xeon Silver 4110"]
+    ["+", "deploy", "YES"]
     ["+", "disk_reservation_count", 3]
     ["+", "disktype", "SATA"]
     ["+", "eth_count", 1]
@@ -960,6 +965,7 @@ TXT
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
     ["+", "cputype", "Intel Xeon Silver 4110"]
+    ["+", "deploy", "YES"]
     ["+", "disk_reservation_count", 3]
     ["+", "disktype", "SATA"]
     ["+", "eth_count", 1]
@@ -1187,7 +1193,7 @@ oarnodesetting --sql "host='clusterb-2.fakesite.grid5000.fr' AND resource_id='35
 TXT
 
       expected_clusterb3_cmds = <<-TXT
-oarnodesetting --sql "host='clusterb-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
+oarnodesetting --sql "host='clusterb-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
 TXT
 
       generator_output = capture do
@@ -1348,7 +1354,7 @@ oarnodesetting -a -h 'clusterc-2.fakesite.grid5000.fr' -p host='clusterc-2.fakes
 oarnodesetting -a -h 'clusterc-2.fakesite.grid5000.fr' -p host='clusterc-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15
 TXT
       expected_clusterc3_cmds = <<-TXT
-oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterc' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
+oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterc' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
 TXT
 
 
@@ -1389,6 +1395,7 @@ TXT
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
     ["+", "cputype", "Intel Xeon Silver 4110"]
+    ["+", "deploy", "YES"]
     ["+", "disk_reservation_count", 3]
     ["+", "disktype", "SATA"]
     ["+", "eth_count", 1]
@@ -1426,6 +1433,7 @@ TXT
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
     ["+", "cputype", "Intel Xeon Silver 4110"]
+    ["+", "deploy", "YES"]
     ["+", "disk_reservation_count", 3]
     ["+", "disktype", "SATA"]
     ["+", "eth_count", 1]
@@ -1563,7 +1571,7 @@ oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' AND resource_id='34
 oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' AND resource_id='35' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15
 TXT
       expected_clusterc3_cmds = <<-TXT
-oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterc' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
+oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterc' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
 TXT
 
       generator_output = capture do
@@ -1718,7 +1726,7 @@ oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' AND resource_id='34
 oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' AND resource_id='35' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15
 TXT
       expected_clusterc3_cmds = <<-TXT
-oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterc' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
+oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterc' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
 TXT
 
       generator_output = capture do
@@ -2119,6 +2127,7 @@ Properties that need to be created on the fakesite server: ib_rate
       "nodemodel": "Dell PowerEdge T640",
       "switch": "gw-fakesite",
       "besteffort": "YES",
+      "deploy": "YES",
       "virtual": "ivt",
       "cpuarch": "x86_64",
       "cpucore": 8,
@@ -2387,11 +2396,11 @@ CORE has an unexpected number of resources (current:31 vs expected:32).
       }
 
       expected_output = <<-TXT
-oarnodesetting --sql "host='clusterb-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
+oarnodesetting --sql "host='clusterb-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
       TXT
 
       expected_output2 = <<-TXT
-oarnodesetting --sql "host='clusterb-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
+oarnodesetting --sql "host='clusterb-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
       TXT
 
       expected_output3 = <<-TXT
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server.json b/spec/stub_oar_properties/dump_oar_api_configured_server.json
index 7905b91ef6fa9e1f352abdeb79fa99da406a9d44..fdc333946afb03a977aec4e8e6ee4f95a02723ef 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server.json
@@ -65,7 +65,7 @@
       "virtual": "ivt",
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "myri_count": 0,
       "ip": "172.16.64.1",
@@ -132,7 +132,7 @@
       "myri_count": 0,
       "ip": "172.16.64.1",
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "virtual": "ivt",
@@ -170,7 +170,7 @@
       "cpu": 1,
       "drain": "NO",
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "mic": "NO",
@@ -238,7 +238,7 @@
       "memcpu": 65536,
       "memcore": 8192,
       "cpufreq": "2.1",
-      "deploy": "NO",
+      "deploy": "YES",
       "max_walltime": 86400,
       "myri": "NO",
       "ip": "172.16.64.1",
@@ -359,7 +359,7 @@
       "core": 5,
       "myri": "NO",
       "max_walltime": 86400,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
@@ -426,7 +426,7 @@
       "expiry_date": 0,
       "nodemodel": "Dell PowerEdge T640",
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "virtual": "ivt",
@@ -532,7 +532,7 @@
       "memcpu": 65536,
       "memcore": 8192,
       "cpufreq": "2.1",
-      "deploy": "NO"
+      "deploy": "YES"
     },
     {
       "api_timestamp": 1568902577,
@@ -594,7 +594,7 @@
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpu": 1,
       "virtual": "ivt",
       "cputype": "Intel Xeon Silver 4110",
@@ -673,7 +673,7 @@
       "cputype": "Intel Xeon Silver 4110",
       "memcore": 8192,
       "cpufreq": "2.1",
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "myri_count": 0,
       "core": 9,
@@ -693,7 +693,7 @@
       "cputype": "Intel Xeon Silver 4110",
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "myri_count": 0,
       "core": 10,
@@ -770,7 +770,7 @@
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "myri": "NO",
       "max_walltime": 86400,
       "core": 11,
@@ -855,7 +855,7 @@
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "drain": "NO",
       "cpu": 2,
@@ -929,7 +929,7 @@
       "cputype": "Intel Xeon Silver 4110",
       "virtual": "ivt",
       "cpu": 2,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
@@ -1053,7 +1053,7 @@
       "virtual": "ivt",
       "memcore": 8192,
       "cpufreq": "2.1",
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "myri_count": 0,
       "ip": "172.16.64.1",
@@ -1070,7 +1070,7 @@
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpu": 2,
       "virtual": "ivt",
       "cputype": "Intel Xeon Silver 4110",
@@ -1204,7 +1204,7 @@
       "cpu": 2,
       "drain": "NO",
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "myri": "NO",
@@ -1240,7 +1240,7 @@
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "myri": "NO",
       "max_walltime": 86400,
       "myri_count": 0,
@@ -1312,7 +1312,7 @@
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "mic": "NO",
       "ib_count": 0,
       "gpu_model": "GeForce RTX 2080 Ti",
@@ -1423,7 +1423,7 @@
       "core": 19,
       "max_walltime": 86400,
       "myri": "NO",
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "memcpu": 65536,
@@ -1513,7 +1513,7 @@
       "ip": "172.16.64.2",
       "max_walltime": 86400,
       "myri": "NO",
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "memcpu": 65536,
@@ -1538,7 +1538,7 @@
       "gpu_model": "GeForce RTX 2080 Ti",
       "ib_count": 0,
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "cputype": "Intel Xeon Silver 4110",
@@ -1642,7 +1642,7 @@
       "nodemodel": "Dell PowerEdge T640",
       "expiry_date": 0,
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "virtual": "ivt",
@@ -1694,7 +1694,7 @@
       "cpu": 3,
       "drain": "NO",
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "max_walltime": 86400,
@@ -1782,7 +1782,7 @@
       "memcpu": 65536,
       "memcore": 8192,
       "cpufreq": "2.1",
-      "deploy": "NO",
+      "deploy": "YES",
       "expiry_date": 0,
       "nodemodel": "Dell PowerEdge T640",
       "gpu": 6,
@@ -1845,7 +1845,7 @@
       "virtual": "ivt",
       "cputype": "Intel Xeon Silver 4110",
       "cpu": 4,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "memcpu": 65536,
@@ -1946,7 +1946,7 @@
       "nodemodel": "Dell PowerEdge T640",
       "expiry_date": 0,
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "cputype": "Intel Xeon Silver 4110",
@@ -2035,7 +2035,7 @@
       "cputype": "Intel Xeon Silver 4110",
       "virtual": "ivt",
       "cpu": 4,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
@@ -2071,7 +2071,7 @@
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "drain": "NO",
       "cpu": 4,
@@ -2137,7 +2137,7 @@
       "cputype": "Intel Xeon Silver 4110",
       "memcore": 8192,
       "cpufreq": "2.1",
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "core": 29,
       "myri_count": 0,
@@ -2274,7 +2274,7 @@
       "core": 30,
       "ip": "172.16.64.2",
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "cputype": "Intel Xeon Silver 4110",
@@ -2287,7 +2287,7 @@
       "cputype": "Intel Xeon Silver 4110",
       "virtual": "ivt",
       "cpu": 4,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "memcpu": 65536,
@@ -2385,7 +2385,7 @@
       "myri": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "drain": "NO",
       "cpu": 4,
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_missing_property.json b/spec/stub_oar_properties/dump_oar_api_configured_server_missing_property.json
index 4d392db5e2a547627fe79f79fed39b62fe3970ee..1c244f7a480ad7391c16087803a3d0dd0a0c4cf0 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_missing_property.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_missing_property.json
@@ -64,7 +64,7 @@
       "virtual": "ivt",
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "myri_count": 0,
       "ip": "172.16.64.1",
@@ -130,7 +130,7 @@
       "myri_count": 0,
       "ip": "172.16.64.1",
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "virtual": "ivt",
@@ -168,7 +168,7 @@
       "cpu": 1,
       "drain": "NO",
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "mic": "NO",
@@ -235,7 +235,7 @@
       "memcpu": 65536,
       "memcore": 8192,
       "cpufreq": "2.1",
-      "deploy": "NO",
+      "deploy": "YES",
       "max_walltime": 86400,
       "myri": "NO",
       "ip": "172.16.64.1",
@@ -354,7 +354,7 @@
       "core": 5,
       "myri": "NO",
       "max_walltime": 86400,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
@@ -420,7 +420,7 @@
       "expiry_date": 0,
       "nodemodel": "Dell PowerEdge T640",
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "virtual": "ivt",
@@ -525,7 +525,7 @@
       "memcpu": 65536,
       "memcore": 8192,
       "cpufreq": "2.1",
-      "deploy": "NO"
+      "deploy": "YES"
     },
     {
       "api_timestamp": 1568902577,
@@ -586,7 +586,7 @@
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpu": 1,
       "virtual": "ivt",
       "cputype": "Intel Xeon Silver 4110",
@@ -664,7 +664,7 @@
       "cputype": "Intel Xeon Silver 4110",
       "memcore": 8192,
       "cpufreq": "2.1",
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "myri_count": 0,
       "core": 9,
@@ -684,7 +684,7 @@
       "cputype": "Intel Xeon Silver 4110",
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "myri_count": 0,
       "core": 10,
@@ -760,7 +760,7 @@
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "myri": "NO",
       "max_walltime": 86400,
       "core": 11,
@@ -844,7 +844,7 @@
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "drain": "NO",
       "cpu": 2,
@@ -917,7 +917,7 @@
       "cputype": "Intel Xeon Silver 4110",
       "virtual": "ivt",
       "cpu": 2,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
@@ -1041,7 +1041,7 @@
       "virtual": "ivt",
       "memcore": 8192,
       "cpufreq": "2.1",
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "myri_count": 0,
       "ip": "172.16.64.1",
@@ -1058,7 +1058,7 @@
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpu": 2,
       "virtual": "ivt",
       "cputype": "Intel Xeon Silver 4110",
@@ -1192,7 +1192,7 @@
       "cpu": 2,
       "drain": "NO",
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "myri": "NO",
@@ -1228,7 +1228,7 @@
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "myri": "NO",
       "max_walltime": 86400,
       "myri_count": 0,
@@ -1300,7 +1300,7 @@
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "mic": "NO",
       "ib_count": 0,
       "gpu_model": "GeForce RTX 2080 Ti",
@@ -1411,7 +1411,7 @@
       "core": 19,
       "max_walltime": 86400,
       "myri": "NO",
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "memcpu": 65536,
@@ -1501,7 +1501,7 @@
       "ip": "172.16.64.2",
       "max_walltime": 86400,
       "myri": "NO",
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "memcpu": 65536,
@@ -1526,7 +1526,7 @@
       "gpu_model": "GeForce RTX 2080 Ti",
       "ib_count": 0,
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "cputype": "Intel Xeon Silver 4110",
@@ -1630,7 +1630,7 @@
       "nodemodel": "Dell PowerEdge T640",
       "expiry_date": 0,
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "virtual": "ivt",
@@ -1682,7 +1682,7 @@
       "cpu": 3,
       "drain": "NO",
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "max_walltime": 86400,
@@ -1770,7 +1770,7 @@
       "memcpu": 65536,
       "memcore": 8192,
       "cpufreq": "2.1",
-      "deploy": "NO",
+      "deploy": "YES",
       "expiry_date": 0,
       "nodemodel": "Dell PowerEdge T640",
       "gpu": 6,
@@ -1833,7 +1833,7 @@
       "virtual": "ivt",
       "cputype": "Intel Xeon Silver 4110",
       "cpu": 4,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "memcpu": 65536,
@@ -1934,7 +1934,7 @@
       "nodemodel": "Dell PowerEdge T640",
       "expiry_date": 0,
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "cputype": "Intel Xeon Silver 4110",
@@ -2023,7 +2023,7 @@
       "cputype": "Intel Xeon Silver 4110",
       "virtual": "ivt",
       "cpu": 4,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
@@ -2059,7 +2059,7 @@
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "drain": "NO",
       "cpu": 4,
@@ -2125,7 +2125,7 @@
       "cputype": "Intel Xeon Silver 4110",
       "memcore": 8192,
       "cpufreq": "2.1",
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "core": 29,
       "myri_count": 0,
@@ -2262,7 +2262,7 @@
       "core": 30,
       "ip": "172.16.64.2",
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "cputype": "Intel Xeon Silver 4110",
@@ -2275,7 +2275,7 @@
       "cputype": "Intel Xeon Silver 4110",
       "virtual": "ivt",
       "cpu": 4,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "memcpu": 65536,
@@ -2373,7 +2373,7 @@
       "myri": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "drain": "NO",
       "cpu": 4,
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_quirk_cluster.json b/spec/stub_oar_properties/dump_oar_api_configured_server_quirk_cluster.json
index 7d56c7b0f5eea52c4acace60cc109e7f0f538e62..496e660e4380debe48604c4524571540e0d13f11 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_quirk_cluster.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_quirk_cluster.json
@@ -47,7 +47,7 @@
          "ip" : "172.16.64.1",
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "links" : [
             {
                "href" : "//oarapi/resources/nodes/clusterc-1.fakesite.grid5000.fr",
@@ -155,7 +155,7 @@
          "cluster_priority" : 201906,
          "ip" : "172.16.64.1",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "suspended_jobs" : "NO",
          "memcore" : 8192,
          "gpu_count" : 0,
@@ -172,7 +172,7 @@
          "wattmeter" : "MULTIPLE",
          "diskpath" : null,
          "ip" : "172.16.64.1",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "suspended_jobs" : "NO",
          "links" : [
@@ -264,7 +264,7 @@
          "last_job_date" : 0,
          "id" : 4,
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "suspended_jobs" : "NO",
          "ip" : "172.16.64.1",
          "diskpath" : null,
@@ -373,7 +373,7 @@
          "memcore" : 8192,
          "gpu_count" : 0,
          "wattmeter" : "MULTIPLE",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "suspended_jobs" : "NO",
          "ip" : "172.16.64.1",
@@ -463,7 +463,7 @@
          "ip" : "172.16.64.1",
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ib" : "NO",
          "production" : "YES",
          "next_state" : "UnChanged",
@@ -496,7 +496,7 @@
          "diskpath" : null,
          "ip" : "172.16.64.1",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "suspended_jobs" : "NO",
          "last_job_date" : 0,
          "links" : [
@@ -592,7 +592,7 @@
          "expiry_date" : 0,
          "ip" : "172.16.64.1",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "suspended_jobs" : "NO",
          "id" : 8,
          "links" : [
@@ -672,7 +672,7 @@
          "id" : 9,
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ip" : "172.16.64.1",
          "expiry_date" : 0,
          "last_available_upto" : 0,
@@ -731,7 +731,7 @@
          "ip" : "172.16.64.1",
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "last_job_date" : 0,
          "links" : [
             {
@@ -857,7 +857,7 @@
          "memnode" : 131072,
          "ip" : "172.16.64.1",
          "suspended_jobs" : "NO",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "wattmeter" : "MULTIPLE",
          "gpu_count" : 0,
@@ -915,7 +915,7 @@
          "production" : "YES",
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ip" : "172.16.64.1",
          "memnode" : 131072,
          "cluster_priority" : 201906,
@@ -1019,7 +1019,7 @@
          "id" : 13,
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ip" : "172.16.64.1"
       },
       {
@@ -1060,7 +1060,7 @@
          "expiry_date" : 0,
          "ip" : "172.16.64.1",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "suspended_jobs" : "NO",
          "links" : [
             {
@@ -1164,7 +1164,7 @@
          "memnode" : 131072,
          "ip" : "172.16.64.1",
          "suspended_jobs" : "NO",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "production" : "YES",
          "ib" : "NO",
@@ -1219,7 +1219,7 @@
          "ip" : "172.16.64.1",
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "last_available_upto" : 0,
          "expiry_date" : 0,
          "cpufreq" : "2.1",
@@ -1544,7 +1544,7 @@
          "wattmeter" : "MULTIPLE",
          "memcore" : 8192,
          "suspended_jobs" : "NO",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "ip" : "172.16.64.2",
          "cluster_priority" : 201906,
@@ -1601,7 +1601,7 @@
          "cluster_priority" : 201906,
          "memnode" : 131072,
          "ip" : "172.16.64.2",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "suspended_jobs" : "NO",
          "memcore" : 8192,
@@ -1659,7 +1659,7 @@
          "production" : "YES",
          "ib" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "suspended_jobs" : "NO",
          "ip" : "172.16.64.2",
          "cluster_priority" : 201906,
@@ -1757,7 +1757,7 @@
          ],
          "id" : 23,
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "suspended_jobs" : "NO",
          "ip" : "172.16.64.2",
          "diskpath" : null,
@@ -1836,7 +1836,7 @@
          "last_job_date" : 0,
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ip" : "172.16.64.2",
          "diskpath" : null,
          "gpu_count" : 0,
@@ -1893,7 +1893,7 @@
          "ib" : "NO",
          "production" : "YES",
          "ip" : "172.16.64.2",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "suspended_jobs" : "NO",
          "links" : [
@@ -1966,7 +1966,7 @@
          "wattmeter" : "MULTIPLE",
          "diskpath" : null,
          "ip" : "172.16.64.2",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "suspended_jobs" : "NO",
          "id" : 26,
@@ -2080,7 +2080,7 @@
          "memcore" : 8192,
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ip" : "172.16.64.2",
          "cluster_priority" : 201906,
          "memnode" : 131072,
@@ -2164,7 +2164,7 @@
          "ip" : "172.16.64.2",
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "id" : 28,
          "links" : [
             {
@@ -2262,7 +2262,7 @@
          "ip" : "172.16.64.2",
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "gpu_count" : 0,
          "wattmeter" : "MULTIPLE",
          "memcore" : 8192,
@@ -2329,7 +2329,7 @@
          "ip" : "172.16.64.2",
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "wattmeter" : "MULTIPLE",
          "gpu_count" : 0,
          "memcore" : 8192,
@@ -2423,7 +2423,7 @@
          "last_job_date" : 0,
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ip" : "172.16.64.2"
       },
       {
@@ -2466,7 +2466,7 @@
          "cluster_priority" : 201906,
          "ip" : "172.16.64.2",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "suspended_jobs" : "NO",
          "last_available_upto" : 0,
          "expiry_date" : 0,
@@ -2516,7 +2516,7 @@
          "next_state" : "UnChanged",
          "production" : "YES",
          "ib" : "NO",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "suspended_jobs" : "NO",
          "ip" : "172.16.64.2",
@@ -2656,7 +2656,7 @@
          "id" : 34,
          "last_job_date" : 0,
          "suspended_jobs" : "NO",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "ip" : "172.16.64.2"
       },
@@ -2699,7 +2699,7 @@
          "ip" : "172.16.64.2",
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "id" : 35,
          "links" : [
             {
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_with_disk.json b/spec/stub_oar_properties/dump_oar_api_configured_server_with_disk.json
index 64e765c3fbdad3680db9dafd193d37f96ff175a7..224837f20ef75452c8731183d9efec574f16bcc9 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_with_disk.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_with_disk.json
@@ -62,7 +62,7 @@
          "cpufreq" : "2.1",
          "cpu" : 1,
          "last_job_date" : 0,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ib_count" : 0,
          "expiry_date" : 0,
          "opa_count" : 0,
@@ -138,7 +138,7 @@
          "expiry_date" : 0,
          "cpufreq" : "2.1",
          "myri_count" : 0,
-         "deploy" : "NO",
+         "deploy": "YES",
          "cpucore" : 8,
          "cpu" : 1,
          "last_job_date" : 0,
@@ -180,7 +180,7 @@
          "myri_count" : 0,
          "cpucore" : 8,
          "cpufreq" : "2.1",
-         "deploy" : "NO",
+         "deploy": "YES",
          "cpu" : 1,
          "last_job_date" : 0,
          "opa_count" : 0,
@@ -303,7 +303,7 @@
          "cpucore" : 8,
          "myri_count" : 0,
          "cpufreq" : "2.1",
-         "deploy" : "NO",
+         "deploy": "YES",
          "cpu" : 1,
          "last_job_date" : 0,
          "expiry_date" : 0,
@@ -387,7 +387,7 @@
          "cpucore" : 8,
          "myri_count" : 0,
          "cpufreq" : "2.1",
-         "deploy" : "NO",
+         "deploy": "YES",
          "cpu" : 1,
          "last_job_date" : 0,
          "ib_count" : 0,
@@ -464,7 +464,7 @@
          "cpufreq" : "2.1",
          "cpucore" : 8,
          "cpu" : 1,
-         "deploy" : "NO",
+         "deploy": "YES",
          "last_job_date" : 0,
          "opa" : "NO",
          "besteffort" : "YES",
@@ -492,7 +492,7 @@
          "cpucore" : 8,
          "cpufreq" : "2.1",
          "cpu" : 1,
-         "deploy" : "NO",
+         "deploy": "YES",
          "last_job_date" : 0,
          "expiry_date" : 0,
          "ib_count" : 0,
@@ -614,7 +614,7 @@
          "last_job_date" : 0,
          "cpucore" : 8,
          "cpu" : 1,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ib_count" : 0,
          "expiry_date" : 0,
          "drain" : "NO",
@@ -643,7 +643,7 @@
          "cpufreq" : "2.1",
          "cpucore" : 8,
          "last_job_date" : 0,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ib_count" : 0,
          "expiry_date" : 0,
          "opa_rate" : 0,
@@ -779,7 +779,7 @@
          "cpufreq" : "2.1",
          "cpucore" : 8,
          "last_job_date" : 0,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ib_count" : 0,
          "expiry_date" : 0
       },
@@ -837,7 +837,7 @@
          "myri_count" : 0,
          "cpucore" : 8,
          "cpufreq" : "2.1",
-         "deploy" : "NO",
+         "deploy": "YES",
          "cpu" : 2,
          "last_job_date" : 0,
          "opa_count" : 0,
@@ -921,7 +921,7 @@
          "cpu" : 2,
          "cpucore" : 8,
          "last_job_date" : 0,
-         "deploy" : "NO",
+         "deploy": "YES",
          "expiry_date" : 0,
          "ib_count" : 0,
          "opa_rate" : 0,
@@ -1003,7 +1003,7 @@
          "cpu" : 2,
          "cpufreq" : "2.1",
          "cpucore" : 8,
-         "deploy" : "NO",
+         "deploy": "YES",
          "last_job_date" : 0,
          "expiry_date" : 0,
          "ib_count" : 0,
@@ -1087,7 +1087,7 @@
          "cpufreq" : "2.1",
          "cpu" : 2,
          "cpucore" : 8,
-         "deploy" : "NO",
+         "deploy": "YES",
          "last_job_date" : 0,
          "suspended_jobs" : "NO",
          "eth_rate" : 10,
@@ -1106,7 +1106,7 @@
          "myri_count" : 0,
          "cpucore" : 8,
          "cpufreq" : "2.1",
-         "deploy" : "NO",
+         "deploy": "YES",
          "cpu" : 2,
          "last_job_date" : 0,
          "eth_rate" : 10,
@@ -1196,7 +1196,7 @@
          "cpucore" : 8,
          "cpu" : 2,
          "last_job_date" : 0,
-         "deploy" : "NO",
+         "deploy": "YES",
          "suspended_jobs" : "NO",
          "eth_rate" : 10,
          "drain" : "NO",
@@ -1500,7 +1500,7 @@
          "cpufreq" : "2.1",
          "last_job_date" : 0,
          "cpu" : 3,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ib_count" : 0,
          "expiry_date" : 0,
          "opa_count" : 0,
@@ -1579,7 +1579,7 @@
          "cpucore" : 8,
          "cpu" : 3,
          "last_job_date" : 0,
-         "deploy" : "NO",
+         "deploy": "YES",
          "expiry_date" : 0,
          "ib_count" : 0,
          "opa_rate" : 0,
@@ -1662,7 +1662,7 @@
          "cpufreq" : "2.1",
          "last_job_date" : 0,
          "cpu" : 3,
-         "deploy" : "NO",
+         "deploy": "YES",
          "expiry_date" : 0,
          "ib_count" : 0,
          "eth_rate" : 10,
@@ -1772,7 +1772,7 @@
          "cpucore" : 8,
          "cpufreq" : "2.1",
          "cpu" : 3,
-         "deploy" : "NO",
+         "deploy": "YES",
          "last_job_date" : 0,
          "ib_count" : 0,
          "expiry_date" : 0,
@@ -1855,7 +1855,7 @@
          "cpufreq" : "2.1",
          "cpucore" : 8,
          "cpu" : 3,
-         "deploy" : "NO",
+         "deploy": "YES",
          "expiry_date" : 0,
          "ib_count" : 0,
          "opa_count" : 0,
@@ -1943,7 +1943,7 @@
          "cpufreq" : "2.1",
          "cpucore" : 8,
          "cpu" : 3,
-         "deploy" : "NO",
+         "deploy": "YES",
          "last_job_date" : 0,
          "expiry_date" : 0,
          "ib_count" : 0,
@@ -1980,7 +1980,7 @@
          "cpufreq" : "2.1",
          "last_job_date" : 0,
          "cpu" : 3,
-         "deploy" : "NO",
+         "deploy": "YES",
          "opa_count" : 0,
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
@@ -2102,7 +2102,7 @@
          "cpufreq" : "2.1",
          "cpucore" : 8,
          "cpu" : 3,
-         "deploy" : "NO",
+         "deploy": "YES",
          "eth_rate" : 10,
          "drain" : "NO",
          "cpuset" : 7,
@@ -2183,7 +2183,7 @@
          "myri_count" : 0,
          "cpucore" : 8,
          "cpu" : 4,
-         "deploy" : "NO",
+         "deploy": "YES",
          "last_job_date" : 0,
          "opa_count" : 0
       },
@@ -2211,7 +2211,7 @@
          "ib_count" : 0,
          "myri_count" : 0,
          "cpufreq" : "2.1",
-         "deploy" : "NO",
+         "deploy": "YES",
          "cpucore" : 8,
          "cpu" : 4,
          "last_job_date" : 0,
@@ -2335,7 +2335,7 @@
          "cpufreq" : "2.1",
          "cpu" : 4,
          "last_job_date" : 0,
-         "deploy" : "NO",
+         "deploy": "YES",
          "opa_count" : 0,
          "eth_rate" : 10,
          "cpuset" : 10,
@@ -2401,7 +2401,7 @@
          "myri_count" : 0,
          "cpu" : 4,
          "cpucore" : 8,
-         "deploy" : "NO",
+         "deploy": "YES",
          "last_job_date" : 0,
          "expiry_date" : 0,
          "ib_count" : 0,
@@ -2476,7 +2476,7 @@
          "cpufreq" : "2.1",
          "cpucore" : 8,
          "last_job_date" : 0,
-         "deploy" : "NO",
+         "deploy": "YES",
          "expiry_date" : 0,
          "ib_count" : 0,
          "network_address" : "clusterb-2.fakesite.grid5000.fr",
@@ -2569,7 +2569,7 @@
          "cpucore" : 8,
          "cpufreq" : "2.1",
          "cpu" : 4,
-         "deploy" : "NO",
+         "deploy": "YES",
          "last_job_date" : 0,
          "cpuset" : 13,
          "eth_rate" : 10,
@@ -2599,7 +2599,7 @@
          "last_job_date" : 0,
          "cpucore" : 8,
          "cpu" : 4,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ib_count" : 0,
          "expiry_date" : 0,
          "opa" : "NO",
@@ -2680,7 +2680,7 @@
          "cpu" : 4,
          "cpucore" : 8,
          "last_job_date" : 0,
-         "deploy" : "NO",
+         "deploy": "YES",
          "expiry_date" : 0,
          "ib_count" : 0,
          "opa_count" : 0,
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_without_gpu.json b/spec/stub_oar_properties/dump_oar_api_configured_server_without_gpu.json
index 83e5bd6b14119b18b92dbce3d9065436766676a5..757019d33472ec59c7ad1ea250617bbebecb44d8 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_without_gpu.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_without_gpu.json
@@ -47,7 +47,7 @@
          "ip" : "172.16.64.1",
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "links" : [
             {
                "href" : "//oarapi/resources/nodes/clusterc-1.fakesite.grid5000.fr",
@@ -155,7 +155,7 @@
          "cluster_priority" : 201906,
          "ip" : "172.16.64.1",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "suspended_jobs" : "NO",
          "memcore" : 8192,
          "gpu_count" : 0,
@@ -172,7 +172,7 @@
          "wattmeter" : "MULTIPLE",
          "diskpath" : null,
          "ip" : "172.16.64.1",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "suspended_jobs" : "NO",
          "links" : [
@@ -264,7 +264,7 @@
          "last_job_date" : 0,
          "id" : 4,
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "suspended_jobs" : "NO",
          "ip" : "172.16.64.1",
          "diskpath" : null,
@@ -373,7 +373,7 @@
          "memcore" : 8192,
          "gpu_count" : 0,
          "wattmeter" : "MULTIPLE",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "suspended_jobs" : "NO",
          "ip" : "172.16.64.1",
@@ -463,7 +463,7 @@
          "ip" : "172.16.64.1",
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ib" : "NO",
          "production" : "YES",
          "next_state" : "UnChanged",
@@ -496,7 +496,7 @@
          "diskpath" : null,
          "ip" : "172.16.64.1",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "suspended_jobs" : "NO",
          "last_job_date" : 0,
          "links" : [
@@ -592,7 +592,7 @@
          "expiry_date" : 0,
          "ip" : "172.16.64.1",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "suspended_jobs" : "NO",
          "id" : 8,
          "links" : [
@@ -672,7 +672,7 @@
          "id" : 9,
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ip" : "172.16.64.1",
          "expiry_date" : 0,
          "last_available_upto" : 0,
@@ -731,7 +731,7 @@
          "ip" : "172.16.64.1",
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "last_job_date" : 0,
          "links" : [
             {
@@ -857,7 +857,7 @@
          "memnode" : 131072,
          "ip" : "172.16.64.1",
          "suspended_jobs" : "NO",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "wattmeter" : "MULTIPLE",
          "gpu_count" : 0,
@@ -915,7 +915,7 @@
          "production" : "YES",
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ip" : "172.16.64.1",
          "memnode" : 131072,
          "cluster_priority" : 201906,
@@ -1019,7 +1019,7 @@
          "id" : 13,
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ip" : "172.16.64.1"
       },
       {
@@ -1060,7 +1060,7 @@
          "expiry_date" : 0,
          "ip" : "172.16.64.1",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "suspended_jobs" : "NO",
          "links" : [
             {
@@ -1164,7 +1164,7 @@
          "memnode" : 131072,
          "ip" : "172.16.64.1",
          "suspended_jobs" : "NO",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "production" : "YES",
          "ib" : "NO",
@@ -1219,7 +1219,7 @@
          "ip" : "172.16.64.1",
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "last_available_upto" : 0,
          "expiry_date" : 0,
          "cpufreq" : "2.1",
@@ -1544,7 +1544,7 @@
          "wattmeter" : "MULTIPLE",
          "memcore" : 8192,
          "suspended_jobs" : "NO",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "ip" : "172.16.64.2",
          "cluster_priority" : 201906,
@@ -1601,7 +1601,7 @@
          "cluster_priority" : 201906,
          "memnode" : 131072,
          "ip" : "172.16.64.2",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "suspended_jobs" : "NO",
          "memcore" : 8192,
@@ -1659,7 +1659,7 @@
          "production" : "YES",
          "ib" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "suspended_jobs" : "NO",
          "ip" : "172.16.64.2",
          "cluster_priority" : 201906,
@@ -1757,7 +1757,7 @@
          ],
          "id" : 23,
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "suspended_jobs" : "NO",
          "ip" : "172.16.64.2",
          "diskpath" : null,
@@ -1836,7 +1836,7 @@
          "last_job_date" : 0,
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ip" : "172.16.64.2",
          "diskpath" : null,
          "gpu_count" : 0,
@@ -1893,7 +1893,7 @@
          "ib" : "NO",
          "production" : "YES",
          "ip" : "172.16.64.2",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "suspended_jobs" : "NO",
          "links" : [
@@ -1966,7 +1966,7 @@
          "wattmeter" : "MULTIPLE",
          "diskpath" : null,
          "ip" : "172.16.64.2",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "suspended_jobs" : "NO",
          "id" : 26,
@@ -2080,7 +2080,7 @@
          "memcore" : 8192,
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ip" : "172.16.64.2",
          "cluster_priority" : 201906,
          "memnode" : 131072,
@@ -2164,7 +2164,7 @@
          "ip" : "172.16.64.2",
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "id" : 28,
          "links" : [
             {
@@ -2262,7 +2262,7 @@
          "ip" : "172.16.64.2",
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "gpu_count" : 0,
          "wattmeter" : "MULTIPLE",
          "memcore" : 8192,
@@ -2329,7 +2329,7 @@
          "ip" : "172.16.64.2",
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "wattmeter" : "MULTIPLE",
          "gpu_count" : 0,
          "memcore" : 8192,
@@ -2423,7 +2423,7 @@
          "last_job_date" : 0,
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "ip" : "172.16.64.2"
       },
       {
@@ -2466,7 +2466,7 @@
          "cluster_priority" : 201906,
          "ip" : "172.16.64.2",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "suspended_jobs" : "NO",
          "last_available_upto" : 0,
          "expiry_date" : 0,
@@ -2516,7 +2516,7 @@
          "next_state" : "UnChanged",
          "production" : "YES",
          "ib" : "NO",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "suspended_jobs" : "NO",
          "ip" : "172.16.64.2",
@@ -2656,7 +2656,7 @@
          "id" : 34,
          "last_job_date" : 0,
          "suspended_jobs" : "NO",
-         "deploy" : "NO",
+         "deploy": "YES",
          "available_upto" : 2147483647,
          "ip" : "172.16.64.2"
       },
@@ -2699,7 +2699,7 @@
          "ip" : "172.16.64.2",
          "suspended_jobs" : "NO",
          "available_upto" : 2147483647,
-         "deploy" : "NO",
+         "deploy": "YES",
          "id" : 35,
          "links" : [
             {
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_wrong_vartype.json b/spec/stub_oar_properties/dump_oar_api_configured_server_wrong_vartype.json
index 9c21cae959eec808b854225f215bfc14df0897eb..8f095a5a68fe307051f43f3b55bb022e9dc7d273 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_wrong_vartype.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_wrong_vartype.json
@@ -65,7 +65,7 @@
       "virtual": "ivt",
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "myri_count": 0,
       "ip": "172.16.64.1",
@@ -132,7 +132,7 @@
       "myri_count": 0,
       "ip": "172.16.64.1",
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "virtual": "ivt",
@@ -170,7 +170,7 @@
       "cpu": 1,
       "drain": "NO",
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "mic": "NO",
@@ -238,7 +238,7 @@
       "memcpu": 65536,
       "memcore": 8192,
       "cpufreq": "2.1",
-      "deploy": "NO",
+      "deploy": "YES",
       "max_walltime": 86400,
       "myri": "NO",
       "ip": "172.16.64.1",
@@ -359,7 +359,7 @@
       "core": 5,
       "myri": "NO",
       "max_walltime": 86400,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
@@ -426,7 +426,7 @@
       "expiry_date": 0,
       "nodemodel": "Dell PowerEdge T640",
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "virtual": "ivt",
@@ -532,7 +532,7 @@
       "memcpu": 65536,
       "memcore": 8192,
       "cpufreq": "2.1",
-      "deploy": "NO"
+      "deploy": "YES"
     },
     {
       "api_timestamp": 1568902577,
@@ -594,7 +594,7 @@
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpu": 1,
       "virtual": "ivt",
       "cputype": "Intel Xeon Silver 4110",
@@ -673,7 +673,7 @@
       "cputype": "Intel Xeon Silver 4110",
       "memcore": 8192,
       "cpufreq": "2.1",
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "myri_count": 0,
       "core": 9,
@@ -693,7 +693,7 @@
       "cputype": "Intel Xeon Silver 4110",
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "myri_count": 0,
       "core": 10,
@@ -770,7 +770,7 @@
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "myri": "NO",
       "max_walltime": 86400,
       "core": 11,
@@ -855,7 +855,7 @@
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "drain": "NO",
       "cpu": 2,
@@ -929,7 +929,7 @@
       "cputype": "Intel Xeon Silver 4110",
       "virtual": "ivt",
       "cpu": 2,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
@@ -1053,7 +1053,7 @@
       "virtual": "ivt",
       "memcore": 8192,
       "cpufreq": "2.1",
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "myri_count": 0,
       "ip": "172.16.64.1",
@@ -1070,7 +1070,7 @@
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpu": 2,
       "virtual": "ivt",
       "cputype": "Intel Xeon Silver 4110",
@@ -1204,7 +1204,7 @@
       "cpu": 2,
       "drain": "NO",
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "myri": "NO",
@@ -1240,7 +1240,7 @@
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "myri": "NO",
       "max_walltime": 86400,
       "myri_count": 0,
@@ -1312,7 +1312,7 @@
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "mic": "NO",
       "ib_count": 0,
       "gpu_model": "GeForce RTX 2080 Ti",
@@ -1423,7 +1423,7 @@
       "core": 19,
       "max_walltime": 86400,
       "myri": "NO",
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "memcpu": 65536,
@@ -1513,7 +1513,7 @@
       "ip": "172.16.64.2",
       "max_walltime": 86400,
       "myri": "NO",
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "memcpu": 65536,
@@ -1538,7 +1538,7 @@
       "gpu_model": "GeForce RTX 2080 Ti",
       "ib_count": 0,
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "cputype": "Intel Xeon Silver 4110",
@@ -1642,7 +1642,7 @@
       "nodemodel": "Dell PowerEdge T640",
       "expiry_date": 0,
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "virtual": "ivt",
@@ -1694,7 +1694,7 @@
       "cpu": 3,
       "drain": "NO",
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "max_walltime": 86400,
@@ -1782,7 +1782,7 @@
       "memcpu": 65536,
       "memcore": 8192,
       "cpufreq": "2.1",
-      "deploy": "NO",
+      "deploy": "YES",
       "expiry_date": 0,
       "nodemodel": "Dell PowerEdge T640",
       "gpu": 6,
@@ -1845,7 +1845,7 @@
       "virtual": "ivt",
       "cputype": "Intel Xeon Silver 4110",
       "cpu": 4,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "memcpu": 65536,
@@ -1946,7 +1946,7 @@
       "nodemodel": "Dell PowerEdge T640",
       "expiry_date": 0,
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "cputype": "Intel Xeon Silver 4110",
@@ -2035,7 +2035,7 @@
       "cputype": "Intel Xeon Silver 4110",
       "virtual": "ivt",
       "cpu": 4,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
@@ -2071,7 +2071,7 @@
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "drain": "NO",
       "cpu": 4,
@@ -2137,7 +2137,7 @@
       "cputype": "Intel Xeon Silver 4110",
       "memcore": 8192,
       "cpufreq": "2.1",
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "core": 29,
       "myri_count": 0,
@@ -2274,7 +2274,7 @@
       "core": 30,
       "ip": "172.16.64.2",
       "memcpu": 65536,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcore": 8192,
       "cpufreq": "2.1",
       "cputype": "Intel Xeon Silver 4110",
@@ -2287,7 +2287,7 @@
       "cputype": "Intel Xeon Silver 4110",
       "virtual": "ivt",
       "cpu": 4,
-      "deploy": "NO",
+      "deploy": "YES",
       "cpufreq": "2.1",
       "memcore": 8192,
       "memcpu": 65536,
@@ -2385,7 +2385,7 @@
       "myri": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
-      "deploy": "NO",
+      "deploy": "YES",
       "memcpu": 65536,
       "drain": "NO",
       "cpu": 4,