diff --git a/ascend_deployer/library/scp.py b/ascend_deployer/library/scp.py index c8b4bd232bc7e421e47e56843fe6a4511dca5451..7717f94f08a0fafd6aca9d0288843fdde0afb5fd 100644 --- a/ascend_deployer/library/scp.py +++ b/ascend_deployer/library/scp.py @@ -30,7 +30,7 @@ class Scp: ip=dict(type="str", required=True), port=dict(type="str", required=True), remote_user=dict(type="str", required=True), - passwd=dict(type=str, required=True, no_log=True), + passwd=dict(type=str, no_log=True), src=dict(type="str", required=True), dest=dict(type="str", required=True), fetch=dict(type="bool", required=False, default=False), @@ -38,7 +38,7 @@ class Scp: ) self.ip = self.module.params["ip"] self.remote_user = self.module.params["remote_user"] - self.passwd = self.module.params["passwd"] + self.passwd = self.module.params.get("passwd", "") self.src = self.module.params["src"] self.dest = self.module.params["dest"] self.fetch = self.module.params["fetch"] diff --git a/ascend_deployer/playbooks/distribution.yml b/ascend_deployer/playbooks/distribution.yml index f8bf2a9c87cb451d6f680f07afc634ce7deec1ef..d78d3c79410b1abaffc25730e457e87f2ce9b5d4 100644 --- a/ascend_deployer/playbooks/distribution.yml +++ b/ascend_deployer/playbooks/distribution.yml @@ -6,7 +6,7 @@ ip: "{{inventory_hostname}}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ansible_ssh_user}}" - passwd: "{{ansible_ssh_pass|default('')}}" + passwd: "{{ansible_ssh_pass}}" src: "~/resources_{{ansible_architecture}}.tar ../resources/{{os_and_arch}}/bzip2* ../resources/{{os_and_arch}}/unzip* ../resources/{{os_and_arch}}/tar*" dest: "~/" delegate_to: localhost diff --git a/ascend_deployer/playbooks/install/install_ascend-device-plugin.yml b/ascend_deployer/playbooks/install/install_ascend-device-plugin.yml index c7a12e5067bb8f6040f42fc1c935d899eac41823..7cbeacff2a6ecbadcf95ae83ec75cc4cf60ac805 100644 --- a/ascend_deployer/playbooks/install/install_ascend-device-plugin.yml +++ b/ascend_deployer/playbooks/install/install_ascend-device-plugin.yml @@ -13,7 +13,7 @@ ip: "{{ inventory_hostname }}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ ansible_ssh_user }}" - passwd: "{{ ansible_ssh_pass|default('') }}" + passwd: "{{ ansible_ssh_pass }}" src: "{{ device_plugin_images }}" dest: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/device-plugin" fetch: 'true' @@ -37,7 +37,7 @@ ip: "{{ inventory_hostname }}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ ansible_ssh_user }}" - passwd: "{{ ansible_ssh_pass|default('') }}" + passwd: "{{ ansible_ssh_pass }}" src: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/device-plugin/*" dest: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/device-plugin/" delegate_to: localhost diff --git a/ascend_deployer/playbooks/install/install_ascend-operator.yml b/ascend_deployer/playbooks/install/install_ascend-operator.yml index c8b8c29d0d8c5dca7308f1f3275b475e97332290..0ccad881d0bf5b195ac41c9f55f3bf9ca8224a1b 100644 --- a/ascend_deployer/playbooks/install/install_ascend-operator.yml +++ b/ascend_deployer/playbooks/install/install_ascend-operator.yml @@ -13,7 +13,7 @@ ip: "{{ inventory_hostname }}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ ansible_ssh_user }}" - passwd: "{{ ansible_ssh_pass|default('') }}" + passwd: "{{ ansible_ssh_pass }}" src: "{{ ascend_operator_images }}" dest: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/ascend-operator" fetch: 'true' @@ -28,7 +28,7 @@ ip: "{{ inventory_hostname }}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ ansible_ssh_user }}" - passwd: "{{ ansible_ssh_pass|default('') }}" + passwd: "{{ ansible_ssh_pass }}" src: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/ascend-operator/*" dest: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/ascend-operator/" delegate_to: localhost diff --git a/ascend_deployer/playbooks/install/install_clusterd.yml b/ascend_deployer/playbooks/install/install_clusterd.yml index 393b0201f7ccf93645115e115212a5cd9d37d87a..3e087c11ca22e746f58dc49de3db95fbc407cb75 100644 --- a/ascend_deployer/playbooks/install/install_clusterd.yml +++ b/ascend_deployer/playbooks/install/install_clusterd.yml @@ -29,7 +29,7 @@ ip: "{{ inventory_hostname }}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ ansible_ssh_user }}" - passwd: "{{ ansible_ssh_pass|default('') }}" + passwd: "{{ ansible_ssh_pass }}" src: "{{ clusterd_images }}" dest: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/clusterd" fetch: 'true' @@ -45,7 +45,7 @@ ip: "{{ inventory_hostname }}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ ansible_ssh_user }}" - passwd: "{{ ansible_ssh_pass|default('') }}" + passwd: "{{ ansible_ssh_pass }}" src: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/clusterd/*" dest: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/clusterd/" delegate_to: localhost diff --git a/ascend_deployer/playbooks/install/install_hccl-controller.yml b/ascend_deployer/playbooks/install/install_hccl-controller.yml index 5fc949331ebb7e0dd6f2ddd24072790a6acfdb33..3f643a1168e266341f80ffacb2a73c96c69f1f59 100644 --- a/ascend_deployer/playbooks/install/install_hccl-controller.yml +++ b/ascend_deployer/playbooks/install/install_hccl-controller.yml @@ -19,7 +19,7 @@ ip: "{{ inventory_hostname }}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ ansible_ssh_user }}" - passwd: "{{ ansible_ssh_pass|default('') }}" + passwd: "{{ ansible_ssh_pass }}" src: "{{ hccl_controller_images }}" dest: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/hccl-controller" fetch: 'true' @@ -35,7 +35,7 @@ ip: "{{ inventory_hostname }}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ ansible_ssh_user }}" - passwd: "{{ ansible_ssh_pass|default('') }}" + passwd: "{{ ansible_ssh_pass }}" src: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/hccl-controller/*" dest: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/hccl-controller/" delegate_to: localhost diff --git a/ascend_deployer/playbooks/install/install_noded.yml b/ascend_deployer/playbooks/install/install_noded.yml index db1e3da93bd910734abf5b2332e45fe94b38ec12..10f443ddb0d6e809cdf9122b80b5cd1f4a74cca0 100644 --- a/ascend_deployer/playbooks/install/install_noded.yml +++ b/ascend_deployer/playbooks/install/install_noded.yml @@ -13,7 +13,7 @@ ip: "{{ inventory_hostname }}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ ansible_ssh_user }}" - passwd: "{{ ansible_ssh_pass|default('') }}" + passwd: "{{ ansible_ssh_pass }}" src: "{{ noded_images }}" dest: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/noded" fetch: 'true' @@ -28,7 +28,7 @@ ip: "{{ inventory_hostname }}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ ansible_ssh_user }}" - passwd: "{{ ansible_ssh_pass|default('') }}" + passwd: "{{ ansible_ssh_pass }}" src: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/noded/*" dest: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/noded/" delegate_to: localhost diff --git a/ascend_deployer/playbooks/install/install_npu-exporter.yml b/ascend_deployer/playbooks/install/install_npu-exporter.yml index 9cb6d40b76520b8265c7a6bba65204ee2f6f0fd3..cf417a74b5dd20cdf31ef3295194e7466ea0a610 100644 --- a/ascend_deployer/playbooks/install/install_npu-exporter.yml +++ b/ascend_deployer/playbooks/install/install_npu-exporter.yml @@ -13,7 +13,7 @@ ip: "{{ inventory_hostname }}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ ansible_ssh_user }}" - passwd: "{{ ansible_ssh_pass|default('') }}" + passwd: "{{ ansible_ssh_pass }}" src: "{{ npu_exporter_images }}" dest: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/npu-exporter" fetch: 'true' @@ -28,7 +28,7 @@ ip: "{{ inventory_hostname }}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ ansible_ssh_user }}" - passwd: "{{ ansible_ssh_pass|default('') }}" + passwd: "{{ ansible_ssh_pass }}" src: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/npu-exporter/*" dest: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/npu-exporter/" delegate_to: localhost diff --git a/ascend_deployer/playbooks/install/install_resilience-controller.yml b/ascend_deployer/playbooks/install/install_resilience-controller.yml index 3a8c1d376ff4d848bd6c2ea63529874dc64f7a2b..79a3c0ac48c40cc14019aa9e8328b86d62a232dd 100644 --- a/ascend_deployer/playbooks/install/install_resilience-controller.yml +++ b/ascend_deployer/playbooks/install/install_resilience-controller.yml @@ -13,7 +13,7 @@ ip: "{{ inventory_hostname }}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ ansible_ssh_user }}" - passwd: "{{ ansible_ssh_pass|default('') }}" + passwd: "{{ ansible_ssh_pass }}" src: "{{ resilience_controller_images }}" dest: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/resilience-controller" fetch: 'true' @@ -28,7 +28,7 @@ ip: "{{ inventory_hostname }}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ ansible_ssh_user }}" - passwd: "{{ ansible_ssh_pass|default('') }}" + passwd: "{{ ansible_ssh_pass }}" src: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/resilience-controller/*" dest: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/resilience-controller/" delegate_to: localhost diff --git a/ascend_deployer/playbooks/install/install_volcano.yml b/ascend_deployer/playbooks/install/install_volcano.yml index 1df6226eed3a1a8d93696678bb245d50e9ceed99..5e1421c7fcb338a0ada69b1363df3410fc4b95c8 100644 --- a/ascend_deployer/playbooks/install/install_volcano.yml +++ b/ascend_deployer/playbooks/install/install_volcano.yml @@ -13,7 +13,7 @@ ip: "{{ inventory_hostname }}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ ansible_ssh_user }}" - passwd: "{{ ansible_ssh_pass|default('') }}" + passwd: "{{ ansible_ssh_pass }}" src: "{{ volcano_images }}" dest: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/volcano" fetch: 'true' @@ -29,7 +29,7 @@ ip: "{{ inventory_hostname }}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ ansible_ssh_user }}" - passwd: "{{ ansible_ssh_pass|default('') }}" + passwd: "{{ ansible_ssh_pass }}" src: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/volcano/*" dest: "{{ resource_path }}/mindxdl/dlImages/{{ ansible_architecture }}/volcano/" delegate_to: localhost diff --git a/ascend_deployer/playbooks/label_node.yml b/ascend_deployer/playbooks/label_node.yml index 937bc58a048f99f3d0a16402ddc2249cdfb1114b..460ba09a98bd37150c7a3196439bde2c20d678fb 100644 --- a/ascend_deployer/playbooks/label_node.yml +++ b/ascend_deployer/playbooks/label_node.yml @@ -53,7 +53,7 @@ ip: "{{ inventory_hostname }}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ ansible_ssh_user }}" - passwd: "{{ ansible_ssh_pass|default('') }}" + passwd: "{{ ansible_ssh_pass }}" src: "/root/.ascend_deployer/dl_yaml/label/label_node.json" dest: "/root/.ascend_deployer/dl_yaml/label/groups/{{ inventory_hostname }}" fetch: 'true' diff --git a/ascend_deployer/playbooks/sync_time.yml b/ascend_deployer/playbooks/sync_time.yml index 2e13fe5d914df45709a5b23856e2cbddf391169f..c7f2d0895bbb5621963ac64154abd55064365e08 100644 --- a/ascend_deployer/playbooks/sync_time.yml +++ b/ascend_deployer/playbooks/sync_time.yml @@ -7,7 +7,7 @@ ip: "{{ inventory_hostname }}" port: "{{ansible_ssh_port|default('22')}}" remote_user: "{{ ansible_ssh_user }}" - passwd: "{{ ansible_ssh_pass|default('') }}" + passwd: "{{ ansible_ssh_pass }}" src: "/etc/localtime" dest: "/etc/localtime" delegate_to: localhost