From d3b961e7677231e11e3d8f651e7a6c8909385c31 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 1 Feb 2018 00:31:55 +0000 Subject: [PATCH] simplify and comment on root pw setting --- roles/base/tasks/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 406b4ec920..ca7c7f74e6 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -108,12 +108,16 @@ - name: make sure hostname is set right on rhel7 hosts hostname: name="{{inventory_hostname}}" +# +# We set builders root password in the koji_builder role, so do not set those here +# + - name: set root passwd user: name=root password={{ rootpw }} state=present tags: - rootpw - base - when: not (inventory_hostname.startswith('rawhide') or inventory_hostname.startswith('branched') or inventory_hostname.startswith('compose') or inventory_hostname.startswith('build') or inventory_hostname.startswith('arm') or inventory_hostname.startswith('bkernel') or inventory_hostname.startswith('koji01.stg') or inventory_hostname.startswith('aarch64') or inventory_hostname.startswith('s390') or inventory_hostname.startswith('fed-cloud09') or inventory_hostname.startswith('ppc8-04')) + when: not inventory_hostname.startswith(('build','bkernel','koji01.stg','s390',fed-cloud09')) - name: add ansible root key authorized_key: user=root key="{{ item }}"