diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2020-06-16 16:39:44 +0200 |
|---|---|---|
| committer | Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2020-06-16 16:46:59 +0200 |
| commit | cc01b3ae0b06fb12cb5a6fed672d50ca433598f5 (patch) | |
| tree | 4d86211e81f95d5b6713e6317eccc380a7d7c730 /test/mocks/mass-pnf-sim/pnf-sim-lightweight | |
| parent | 08d234170898e95096277e22b4dbbf82f576c915 (diff) | |
Support setting custom username/password for the file server service
Change-Id: I21964c4b8819444dd0aebdda117a11ba96f92038
Issue-ID: INT-1627
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Diffstat (limited to 'test/mocks/mass-pnf-sim/pnf-sim-lightweight')
3 files changed, 6 insertions, 6 deletions
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml index 5a1bdacd4..8a59a1157 100644 --- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml +++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml @@ -34,10 +34,10 @@ services: ports: - "${PORTSFTP}:22" volumes: - - ./files/onap/:/home/onap/ + - ./files/onap/:/home/${FILESERV_USER}/ - ./fix-sftp-perms.sh:/etc/sftp.d/fix-sftp-perms.sh restart: on-failure - command: onap:pano:1001 + command: ${FILESERV_USER}:${FILESERV_PASS}:1001 ftpes-server-vsftpd-${I}: container_name: ftpes-server-vsftpd-${I} @@ -49,8 +49,8 @@ services: - "${PORTFTPS}:21" - "${FTPS_PASV_MIN}-${FTPS_PASV_MAX}:${FTPS_PASV_MIN}-${FTPS_PASV_MAX}" environment: - FTP_USER: onap - FTP_PASSWORD: pano + FTP_USER: ${FILESERV_USER} + FTP_PASSWORD: ${FILESERV_PASS} PASV_ADDRESS: localhost PASV_MIN_PORT: ${FTPS_PASV_MIN} PASV_MAX_PORT: ${FTPS_PASV_MAX} diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/fix-sftp-perms-template.sh b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/fix-sftp-perms-template.sh new file mode 100755 index 000000000..52e69b74c --- /dev/null +++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/fix-sftp-perms-template.sh @@ -0,0 +1,2 @@ +#!/bin/bash +chmod o+w /home/${FILESERV_USER} diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/fix-sftp-perms.sh b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/fix-sftp-perms.sh deleted file mode 100755 index b9f4dae85..000000000 --- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/fix-sftp-perms.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -chmod o+w /home/onap |