From 649686584fcc005ec2a49f1ae0698a24d0857aae Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Date: Thu, 28 Jan 2016 20:46:18 +0800
Subject: [PATCH] Remove the machine-id which cause nova-compute raise
 exception

Change-Id: I3cfb239e6f99e7079b2781b06550fa627fcb8998
Closes-Bug: #1539064
---
 docker/nova/nova-compute/Dockerfile.j2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index aad9c8ba86..200e2c100d 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -54,7 +54,8 @@ COPY nova_compute_sudoers /etc/sudoers.d/nova_compute_sudoers
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start \
     && chmod 750 /etc/sudoers.d \
-    && chmod 440 /etc/sudoers.d/nova_compute_sudoers
+    && chmod 440 /etc/sudoers.d/nova_compute_sudoers \
+    && rm -f /etc/machine-id
 
 {{ include_footer }}