From 93fcfe7134c68cb8549b36a2d4f53f70e84087b0 Mon Sep 17 00:00:00 2001
From: Zhaokun Fu <fuzk@inspur.com>
Date: Tue, 9 Jan 2018 09:21:15 +0800
Subject: [PATCH] FIX inject password error

The envirenment variable LIBGUESTFS_BACKEND = direct
is not enabled by default in docker container.
Without it, GuestFS() init failed.

Closes-Bug: #1742029

Change-Id: I24330502df7abc8e8f952ebb41bd9ae5e4ba1168
---
 ansible/roles/nova/defaults/main.yml | 2 ++
 ansible/roles/nova/handlers/main.yml | 1 +
 ansible/roles/nova/tasks/config.yml  | 1 +
 3 files changed, 4 insertions(+)

diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml
index cc0b85001f..1dc285d9f6 100644
--- a/ansible/roles/nova/defaults/main.yml
+++ b/ansible/roles/nova/defaults/main.yml
@@ -110,6 +110,8 @@ nova_services:
     container_name: "nova_compute"
     group: "compute"
     image: "{{ nova_compute_image_full }}"
+    environment:
+        LIBGUESTFS_BACKEND: "direct"
     privileged: True
     enabled: "{{ not enable_nova_fake | bool }}"
     ipc_mode: "host"
diff --git a/ansible/roles/nova/handlers/main.yml b/ansible/roles/nova/handlers/main.yml
index aab84b7fba..152fe6b4b9 100644
--- a/ansible/roles/nova/handlers/main.yml
+++ b/ansible/roles/nova/handlers/main.yml
@@ -253,6 +253,7 @@
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
+    environment: "{{ service.environment | default(omit) }}"
     image: "{{ service.image }}"
     privileged: "{{ service.privileged | default(False) }}"
     ipc_mode: "{{ service.ipc_mode | default(omit) }}"
diff --git a/ansible/roles/nova/tasks/config.yml b/ansible/roles/nova/tasks/config.yml
index 834646c956..64069ea442 100644
--- a/ansible/roles/nova/tasks/config.yml
+++ b/ansible/roles/nova/tasks/config.yml
@@ -178,6 +178,7 @@
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"
     image: "{{ item.value.image }}"
+    environment: "{{ item.value.environment|default(omit) }}"
     pid_mode: "{{ item.value.pid_mode|default('') }}"
     ipc_mode: "{{ item.value.ipc_mode|default(omit) }}"
     privileged: "{{ item.value.privileged|default(False) }}"