X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=prototypes%2Fbifrost%2Fplaybooks%2Fopnfv-virtual.yaml;h=3cba98b6b47b6f569917c9a3cf8dbbf926f2f96c;hb=c2c1462236c3926d2afe641bfb8a35bcaf30a4b0;hp=699c966985bc254731e59df48e19bc4cb03e307d;hpb=29e0b0ea6b5555045a7aad07d6c070967fbee355;p=releng.git

diff --git a/prototypes/bifrost/playbooks/opnfv-virtual.yaml b/prototypes/bifrost/playbooks/opnfv-virtual.yaml
index 699c96698..3cba98b6b 100644
--- a/prototypes/bifrost/playbooks/opnfv-virtual.yaml
+++ b/prototypes/bifrost/playbooks/opnfv-virtual.yaml
@@ -48,6 +48,7 @@
       dib_os_element: "{{ ipa_dib_os_element|default('debian') }}"
       dib_os_release: "jessie"
       dib_elements: "ironic-agent {{ ipa_extra_dib_elements | default('') }}"
+      dib_notmpfs: true
       when: create_ipa_image | bool == true
     - role: bifrost-create-dib-image
       dib_imagetype: "qcow2"
@@ -57,14 +58,10 @@
       extra_dib_elements: "{{ lookup('env', 'EXTRA_DIB_ELEMENTS') | default('') }}"
       dib_elements: "vm enable-serial-console simple-init devuser growroot {{ extra_dib_elements }}"
       dib_packages: "{{ lookup('env', 'DIB_OS_PACKAGES') }}"
+      dib_notmpfs: true
       when: create_image_via_dib | bool == true and transform_boot_image | bool == false
     - role: bifrost-keystone-client-config
-      # NOTE(hwoarang): This should be ansible_env.SUDO_USER like in the
-      # upstream playbook. However, we run ansible as root (ie with sudo)
-      # so clouds.yaml will be placed in the user's home directory (see
-      # the bifrost-keystone-client-config role) and then ansible will look
-      # for one in /root and fail. As such we hardcode the user to be 'root'.
-      user: "root"
+      user: "{{ ansible_env.SUDO_USER }}"
       clouds:
         bifrost:
           config_username: "{{ ironic.keystone.default_username }}"