rename wallet var

Signed-off-by: Sergio Nemirowski <[email protected]>
nspcc-dev · Jul 21, 2022 · c7b316b · c7b316b
1 parent 2a263bc
commit c7b316b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -24,10 +24,10 @@ neofs_ir__control_api_config_path: '{{ neofs_ir__conf_dir }}/control.yml'
 # Directory for databases and processing results
 neofs_ir__data_dir: '/var/lib/neofs/ir{{ neofs_ir__instance }}'
 
-neofs_ir__wallet_content: ''
+neofs_ir__wallet_struct: ''
 neofs_ir__wallet_path: '{{ neofs_ir__conf_dir }}/wallet.json'
 neofs_ir__wallet_address: ''
-neofs_ir__wallet_passwd: ''
+neofs_ir__wallet_password: ''
 
 neofs_ir__control_enabled: False
 neofs_ir__control_address: 'localhost'
@@ -58,7 +58,7 @@ neofs_ir__raw_config:
   wallet:
     path: '{{ neofs_ir__wallet_path }}'
     address: '{{ neofs_ir__wallet_address }}'
-    password: '{{ neofs_ir__wallet_passwd }}'
+    password: '{{ neofs_ir__wallet_password }}'
 
   morph:
     endpoint:

diff --git a/tasks/wallet.yml b/tasks/wallet.yml
@@ -2,7 +2,7 @@
 
 - name: Copy NeoFS IR wallet
   ansible.builtin.copy:
-    content: '{{ neofs_ir__wallet_content | to_nice_json(ensure_ascii=False) }}'
+    content: '{{ neofs_ir__wallet_struct | to_nice_json(ensure_ascii=False) }}'
     dest: '{{ neofs_ir__wallet_path }}'
     owner: 'root'
     group: '{{ neofs_ir__group }}'

diff --git a/templates/control.yml.j2 b/templates/control.yml.j2
@@ -2,5 +2,5 @@
 
 endpoint: '{{ neofs_ir__control_address }}:{{ neofs_ir__control_port }}'
 wallet: '{{ neofs_ir__wallet_path }}'
-password: '{{ neofs_ir__wallet_passwd }}'
+password: '{{ neofs_ir__wallet_password }}'
 #ir: true