Merge "Don't assume user's primary group name is the same as username"

This commit is contained in:
Zuul 2018-07-12 16:21:46 +00:00 committed by Gerrit Code Review
commit 8f76845f51
10 changed files with 30 additions and 27 deletions

View File

@ -28,8 +28,8 @@
file: file:
path: "{{ kolla_build_log_path }}" path: "{{ kolla_build_log_path }}"
state: touch state: touch
owner: "{{ ansible_user }}" owner: "{{ ansible_user_uid }}"
group: "{{ ansible_user }}" group: "{{ ansible_user_gid }}"
become: True become: True
- name: Login to docker registry - name: Login to docker registry

View File

@ -22,6 +22,9 @@
include_role: include_role:
name: deactivate-virtualenv name: deactivate-virtualenv
- name: Gather facts
setup:
- name: Ensure the python-virtualenv package is installed - name: Ensure the python-virtualenv package is installed
package: package:
name: python-virtualenv name: python-virtualenv
@ -32,8 +35,8 @@
file: file:
path: "{{ virtualenv_path }}" path: "{{ virtualenv_path }}"
state: directory state: directory
owner: "{{ ansible_user }}" owner: "{{ ansible_user_uid }}"
group: "{{ ansible_user }}" group: "{{ ansible_user_gid }}"
mode: 0755 mode: 0755
# Check whether the virtualenv directory is a subdirectory of the # Check whether the virtualenv directory is a subdirectory of the
# global virtualenv directory. # global virtualenv directory.
@ -44,8 +47,8 @@
file: file:
path: "{{ virtualenv }}" path: "{{ virtualenv }}"
state: directory state: directory
owner: "{{ ansible_user }}" owner: "{{ ansible_user_uid }}"
group: "{{ ansible_user }}" group: "{{ ansible_user_gid }}"
mode: 0700 mode: 0700
become: True become: True

View File

@ -73,8 +73,8 @@
file: file:
path: "{{ image_cache_path }}" path: "{{ image_cache_path }}"
state: directory state: directory
owner: "{{ ansible_user }}" owner: "{{ ansible_user_uid }}"
group: "{{ ansible_user }}" group: "{{ ansible_user_gid }}"
become: True become: True
when: >- when: >-
not image_cache_stat.stat.exists or not image_cache_stat.stat.exists or

View File

@ -3,8 +3,8 @@
file: file:
path: "{{ inspection_store_config_path }}" path: "{{ inspection_store_config_path }}"
state: directory state: directory
owner: "{{ ansible_env.USER }}" owner: "{{ ansible_user_uid }}"
group: "{{ ansible_env.USER }}" group: "{{ ansible_user_gid }}"
mode: 0750 mode: 0750
become: True become: True

View File

@ -3,8 +3,8 @@
file: file:
path: "{{ ipa_images_cache_path }}" path: "{{ ipa_images_cache_path }}"
state: directory state: directory
owner: "{{ ansible_user }}" owner: "{{ ansible_user_uid }}"
group: "{{ ansible_user }}" group: "{{ ansible_user_gid }}"
become: True become: True
- name: Ensure Ironic Python Agent (IPA) images are downloaded - name: Ensure Ironic Python Agent (IPA) images are downloaded

View File

@ -3,8 +3,8 @@
file: file:
path: "{{ item }}" path: "{{ item }}"
state: directory state: directory
owner: "{{ ansible_user_id }}" owner: "{{ ansible_user_uid }}"
group: "{{ ansible_user_id }}" group: "{{ ansible_user_gid }}"
mode: 0750 mode: 0750
become: True become: True
with_items: with_items:

View File

@ -20,8 +20,8 @@
file: file:
path: "{{ kolla_ansible_source_path | dirname }}" path: "{{ kolla_ansible_source_path | dirname }}"
state: directory state: directory
owner: "{{ ansible_user_id }}" owner: "{{ ansible_user_uid }}"
group: "{{ ansible_user_id }}" group: "{{ ansible_user_gid }}"
become: True become: True
when: kolla_ansible_ctl_install_type == 'source' when: kolla_ansible_ctl_install_type == 'source'
@ -36,8 +36,8 @@
file: file:
path: "{{ kolla_ansible_venv | dirname }}" path: "{{ kolla_ansible_venv | dirname }}"
state: directory state: directory
owner: "{{ ansible_user_id }}" owner: "{{ ansible_user_uid }}"
group: "{{ ansible_user_id }}" group: "{{ ansible_user_gid }}"
become: True become: True
when: kolla_ansible_venv is not none when: kolla_ansible_venv is not none

View File

@ -3,8 +3,8 @@
file: file:
path: "{{ item }}" path: "{{ item }}"
state: directory state: directory
owner: "{{ ansible_user_id }}" owner: "{{ ansible_user_uid }}"
group: "{{ ansible_user_id }}" group: "{{ ansible_user_gid }}"
mode: 0750 mode: 0750
become: True become: True
with_items: with_items:

View File

@ -22,8 +22,8 @@
file: file:
path: "{{ kolla_source_path | dirname }}" path: "{{ kolla_source_path | dirname }}"
state: directory state: directory
owner: "{{ ansible_user_id }}" owner: "{{ ansible_user_uid }}"
group: "{{ ansible_user_id }}" group: "{{ ansible_user_gid }}"
become: True become: True
when: kolla_ctl_install_type == 'source' when: kolla_ctl_install_type == 'source'
@ -38,8 +38,8 @@
file: file:
path: "{{ kolla_venv | dirname }}" path: "{{ kolla_venv | dirname }}"
state: directory state: directory
owner: "{{ ansible_user_id }}" owner: "{{ ansible_user_uid }}"
group: "{{ ansible_user_id }}" group: "{{ ansible_user_gid }}"
become: True become: True
when: kolla_venv is not none when: kolla_venv is not none

View File

@ -17,8 +17,8 @@
file: file:
path: "{{ image_cache_path }}" path: "{{ image_cache_path }}"
state: directory state: directory
owner: "{{ ansible_env.USER }}" owner: "{{ ansible_user_uid }}"
group: "{{ ansible_env.USER }}" group: "{{ ansible_user_gid }}"
become: True become: True
# The user data script is used to bring up the network interfaces that will # The user data script is used to bring up the network interfaces that will