diff options
| author |   pmikus <pmikus@cisco.com> | 2021-07-07 06:02:57 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2021-07-08 09:08:00 +0000 |
| commit | 2b537c09d4f9819ce62d9a2b7c6d27850358050c (patch) | |
| tree | 523c0d1ffec21e291991460f724de02921096ad5 /fdio.infra.ansible/roles | |
| parent | 26f1ebf5e85d569018e0a4a1ac188ae59b78b833 (diff) | |
Infra: AWS Jenkins Integration
Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I5910ce0701f865403aa772c7ad5d8eb126c6ec2c
Diffstat (limited to 'fdio.infra.ansible/roles')
| -rw-r--r-- | fdio.infra.ansible/roles/docker/tasks/main.yaml | 4 | ||||
| -rw-r--r-- | fdio.infra.ansible/roles/user_add/defaults/main.yaml | 3 | ||||
| -rw-r--r-- | fdio.infra.ansible/roles/user_add/tasks/main.yaml | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/fdio.infra.ansible/roles/docker/tasks/main.yaml b/fdio.infra.ansible/roles/docker/tasks/main.yaml index 773cbf7a5b..d40e1a44c1 100644 --- a/fdio.infra.ansible/roles/docker/tasks/main.yaml +++ b/fdio.infra.ansible/roles/docker/tasks/main.yaml @@ -75,11 +75,9 @@ - name: Conf - Users to Docker Group user: - name: "{{ item }}" + name: "{{ ansible_user }}" groups: "docker" append: True - loop: "{{ docker_users }}" - when: docker_users tags: - docker-conf-user diff --git a/fdio.infra.ansible/roles/user_add/defaults/main.yaml b/fdio.infra.ansible/roles/user_add/defaults/main.yaml index 56f5098f12..fc80b8aa72 100644 --- a/fdio.infra.ansible/roles/user_add/defaults/main.yaml +++ b/fdio.infra.ansible/roles/user_add/defaults/main.yaml @@ -9,3 +9,6 @@ users_create_homedirs: true # Default list of users to create. users: [] + +# Default enable password login. +sshd_disable_password_login: false
\ No newline at end of file diff --git a/fdio.infra.ansible/roles/user_add/tasks/main.yaml b/fdio.infra.ansible/roles/user_add/tasks/main.yaml index e2ef63db48..24be30dc6e 100644 --- a/fdio.infra.ansible/roles/user_add/tasks/main.yaml +++ b/fdio.infra.ansible/roles/user_add/tasks/main.yaml @@ -33,5 +33,7 @@ line: "PasswordAuthentication no" notify: - "Restart SSHd" + when: + - sshd_disable_password_login tags: - user-add-conf |