Merge pull request #61 from gnosischain/execution_container_name

Use execution_container_name instead of client name

Author: parithosh

mainnet-shadow-fork-7/inventory/group_vars/all.yaml

@@ -141,6 +141,7 @@ common_log_driver: json-file
 ##############################################
 beacon_container_name: beacon
 validator_container_name: validator
+execution_container_name: execution
 hi_peer_count: 100
 separate_validator_process_enabled: true
 

playbooks/stop_all.yml

@@ -13,6 +13,6 @@
       register: stop_result
       failed_when: "(stop_result.rc >= 1) and not ('No such container' in stop_result.stderr)"
     - name: Stop geth client container
-      shell: "docker stop --time=10 {{eth1_client_name}}"
+      shell: "docker stop --time=10 {{execution_container_name}}"
       register: stop_result
-      failed_when: "(stop_result.rc >= 1) and not ('No such container' in stop_result.stderr)"
+      failed_when: "(stop_result.rc >= 1) and not ('No such container' in stop_result.stderr)"

playbooks/tasks/start_execution_node.yml

@@ -5,7 +5,7 @@
   tasks:
     - name: Start execution node container
       docker_container:
-        name: "{{ eth1_client_name }}"
+        name: "{{ execution_container_name }}"
         state: started
         image: "{{ eth1_image_name }}"
         pull: true

playbooks/tasks/stop_execution_node.yml

@@ -4,6 +4,6 @@
   serial: 20
   tasks:
     - name: Stop execution node container
-      shell: "docker stop {{ eth1_client_name }}"
+      shell: "docker stop {{ execution_container_name }}"
       register: stop_result
       failed_when: "(stop_result.rc >= 1) and not ('No such container' in stop_result.stderr)"

playbooks/wipe_all.yml

@@ -23,7 +23,7 @@
         path: "{{validator_node_dir}}"
         state: absent
     - name: Stop execution client container
-      shell: "docker stop {{eth1_client_name}}"
+      shell: "docker stop {{execution_container_name}}"
       register: stop_result
       failed_when: "(stop_result.rc >= 1) and not ('No such container' in stop_result.stderr)"
     - name: Remove execution data
@@ -34,7 +34,7 @@
     - name: Remove testnet dir
       become: true
       when: (testnet_type == 'custom') or
-            (testnet_type == 'prater' and eth2_client_name == 'prysm')
+        (testnet_type == 'prater' and eth2_client_name == 'prysm')
       file:
         path: "{{testnet_dir}}"
         state: absent
@@ -133,4 +133,4 @@
 #     - name: Delete the prometheus config
 #       file:
 #         path: /etc/default/prometheus
-#         state: absent
+#         state: absent