From 49548fbde11606cb3a1266ff1e1eaa84df464d15 Mon Sep 17 00:00:00 2001 From: Vicente Cheng Date: Thu, 29 Feb 2024 11:02:25 +0800 Subject: [PATCH] ansiable: add sftp config - we support sftp configuration when installation. make default that could be easier to transmit file Signed-off-by: Vicente Cheng --- .../ansible/roles/harvester/templates/config-create.yaml.j2 | 4 ++++ .../ansible/roles/harvester/templates/config-join.yaml.j2 | 4 ++++ vagrant-pxe-airgap-harvester/settings.yml | 1 + .../ansible/roles/harvester/templates/config-create.yaml.j2 | 4 ++++ .../ansible/roles/harvester/templates/config-join.yaml.j2 | 4 ++++ vagrant-pxe-harvester/settings.yml | 1 + 6 files changed, 18 insertions(+) diff --git a/vagrant-pxe-airgap-harvester/ansible/roles/harvester/templates/config-create.yaml.j2 b/vagrant-pxe-airgap-harvester/ansible/roles/harvester/templates/config-create.yaml.j2 index 64c737f..c5db61a 100644 --- a/vagrant-pxe-airgap-harvester/ansible/roles/harvester/templates/config-create.yaml.j2 +++ b/vagrant-pxe-airgap-harvester/ansible/roles/harvester/templates/config-create.yaml.j2 @@ -13,6 +13,10 @@ os: {% for ntp_server in settings['harvester_config']['ntp_servers'] %} - {{ ntp_server }} {% endfor %} +{% if settings['harvester_network_config']['sftp'] %} + sshd: + sftp: {{ settings['harvester_network_config']['sftp'] }} +{% endif %} install: mode: create networks: diff --git a/vagrant-pxe-airgap-harvester/ansible/roles/harvester/templates/config-join.yaml.j2 b/vagrant-pxe-airgap-harvester/ansible/roles/harvester/templates/config-join.yaml.j2 index b285eb7..d8df752 100644 --- a/vagrant-pxe-airgap-harvester/ansible/roles/harvester/templates/config-join.yaml.j2 +++ b/vagrant-pxe-airgap-harvester/ansible/roles/harvester/templates/config-join.yaml.j2 @@ -13,6 +13,10 @@ os: {% for ntp_server in settings['harvester_config']['ntp_servers'] %} - {{ ntp_server }} {% endfor %} +{% if settings['harvester_network_config']['sftp'] %} + sshd: + sftp: {{ settings['harvester_network_config']['sftp'] }} +{% endif %} install: mode: join {% if settings['harvester_network_config']['cluster'][node_number |int]['etcd_only'] %} diff --git a/vagrant-pxe-airgap-harvester/settings.yml b/vagrant-pxe-airgap-harvester/settings.yml index d168e99..d81100a 100644 --- a/vagrant-pxe-airgap-harvester/settings.yml +++ b/vagrant-pxe-airgap-harvester/settings.yml @@ -57,6 +57,7 @@ harvester_network_config: ip: 192.168.2.131 mode: DHCP mac: 02:00:00:03:3D:61 + sftp: true cluster: - ip: 192.168.2.30 mac: 02:00:00:0D:62:E2 diff --git a/vagrant-pxe-harvester/ansible/roles/harvester/templates/config-create.yaml.j2 b/vagrant-pxe-harvester/ansible/roles/harvester/templates/config-create.yaml.j2 index 90fc102..2fb9926 100644 --- a/vagrant-pxe-harvester/ansible/roles/harvester/templates/config-create.yaml.j2 +++ b/vagrant-pxe-harvester/ansible/roles/harvester/templates/config-create.yaml.j2 @@ -17,6 +17,10 @@ os: {% for ntp_server in settings['harvester_config']['ntp_servers'] %} - {{ ntp_server }} {% endfor %} +{% if settings['harvester_network_config']['sftp'] %} + sshd: + sftp: {{ settings['harvester_network_config']['sftp'] }} +{% endif %} install: mode: create management_interface: diff --git a/vagrant-pxe-harvester/ansible/roles/harvester/templates/config-join.yaml.j2 b/vagrant-pxe-harvester/ansible/roles/harvester/templates/config-join.yaml.j2 index 3b3085b..dccfa5f 100644 --- a/vagrant-pxe-harvester/ansible/roles/harvester/templates/config-join.yaml.j2 +++ b/vagrant-pxe-harvester/ansible/roles/harvester/templates/config-join.yaml.j2 @@ -18,6 +18,10 @@ os: {% for ntp_server in settings['harvester_config']['ntp_servers'] %} - {{ ntp_server }} {% endfor %} +{% if settings['harvester_network_config']['sftp'] %} + sshd: + sftp: {{ settings['harvester_network_config']['sftp'] }} +{% endif %} install: mode: join {% if settings['harvester_network_config']['cluster'][node_number |int]['etcd_only'] %} diff --git a/vagrant-pxe-harvester/settings.yml b/vagrant-pxe-harvester/settings.yml index 59e716b..705983b 100644 --- a/vagrant-pxe-harvester/settings.yml +++ b/vagrant-pxe-harvester/settings.yml @@ -61,6 +61,7 @@ harvester_network_config: ip: 192.168.0.131 mode: DHCP mac: 02:00:00:03:3D:61 + sftp: true cluster: - ip: 192.168.0.30 mac: 02:00:00:0D:62:E2