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

ansible/container-image-build.yml

@@ -28,10 +28,10 @@
       file:
         path: "{{ kolla_build_log_path }}"
         state: touch
-        owner: "{{ ansible_user }}"
-        group: "{{ ansible_user }}"
+        owner: "{{ ansible_user_uid }}"
+        group: "{{ ansible_user_gid }}"
       become: True
-      
+
     - name: Login to docker registry
       docker_login:
         registry_url: "{{ kolla_docker_registry or omit }}"

ansible/kayobe-target-venv.yml

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

ansible/overcloud-ipa-images.yml

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

ansible/roles/inspection-store/tasks/config.yml

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

ansible/roles/ipa-images/tasks/main.yml

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

ansible/roles/kolla-ansible/tasks/config.yml

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

ansible/roles/kolla-ansible/tasks/install.yml

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

ansible/roles/kolla/tasks/config.yml

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

ansible/roles/kolla/tasks/install.yml

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

ansible/seed-vm-provision.yml

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