opendev/system-config
Code Issues Proposed changes

Merge "Don't create "admin" group"

Browse Source
This commit is contained in:
Zuul 2018-08-24 19:57:28 +00:00 committed by Gerrit Code Review
commit 18bcfeb5c8
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
playbooks/bridge.yaml
View File

@ -1,7 +1,6 @@
- hosts: bridge.openstack.org - hosts: bridge.openstack.org
become: true become: true
roles: roles:
- users
- pip3 - pip3
- install-ansible - install-ansible
- root-keys - root-keys

4
playbooks/roles/install-ansible/tasks/main.yaml
View File

@ -21,7 +21,7 @@
state: directory state: directory
path: /var/cache/ansible path: /var/cache/ansible
owner: root owner: root
group: admin group: root
mode: 0770 mode: 0770
- name: Ensure ansible log dir is writable - name: Ensure ansible log dir is writable
@ -29,7 +29,7 @@
path: /var/log/ansible path: /var/log/ansible
state: directory state: directory
owner: root owner: root
group: admin group: root
mode: 0775 mode: 0775
- name: Copy ansible.cfg in to place - name: Copy ansible.cfg in to place

10
playbooks/roles/users/tasks/main.yaml
View File

@ -1,11 +1,7 @@
- name: Add sudo admin groups - name: Add sudo group
loop:
- sudo
- admin
group: group:
name: "{{ item }}" name: "sudo"
state: present state: present
when:
# NOTE(mordred): We replace the main file rather than dropping a file in to # NOTE(mordred): We replace the main file rather than dropping a file in to
# /etc/sudoers.d to deal with divergent base sudoers files from our distros. # /etc/sudoers.d to deal with divergent base sudoers files from our distros.
@ -52,7 +48,7 @@
uid: "{{ all_users[item].uid }}" uid: "{{ all_users[item].uid }}"
group: "{{ item }}" group: "{{ item }}"
comment: "{{ all_users[item].comment }}" comment: "{{ all_users[item].comment }}"
groups: admin,sudo groups: sudo
shell: /bin/bash shell: /bin/bash
when: when:
- item in all_users - item in all_users