summaryrefslogtreecommitdiffstats
path: root/prototypes/bifrost
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-05-09 14:09:52 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-09 14:09:52 +0000
commit5810ec4eaa3bddf165f255fd222f864712c5d34f (patch)
treebb04d94d106b565c52a90a697e199f385c67237c /prototypes/bifrost
parenta495738171484faa8248bb6c12cfde0c1d123ff3 (diff)
parent69f8d1167c7f3c9b10fa919c196ecff5239a8a93 (diff)
Merge "prototypes: bifrost: Write clouds.yaml file for regular users"
Diffstat (limited to 'prototypes/bifrost')
-rw-r--r--prototypes/bifrost/playbooks/opnfv-virtual.yaml7
1 files changed, 1 insertions, 6 deletions
diff --git a/prototypes/bifrost/playbooks/opnfv-virtual.yaml b/prototypes/bifrost/playbooks/opnfv-virtual.yaml
index 699c96698..94de628a6 100644
--- a/prototypes/bifrost/playbooks/opnfv-virtual.yaml
+++ b/prototypes/bifrost/playbooks/opnfv-virtual.yaml
@@ -59,12 +59,7 @@
dib_packages: "{{ lookup('env', 'DIB_OS_PACKAGES') }}"
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 }}"