aboutsummaryrefslogtreecommitdiff
path: root/docker/nova
diff options
context:
space:
mode:
authorJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-01-28 20:46:18 +0800
committerJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-01-29 00:48:40 +0800
commit649686584fcc005ec2a49f1ae0698a24d0857aae (patch)
tree714c841d8468b09205d41c0c565ba39a5be122ca /docker/nova
parent42fc119658fd8a5f966e8658d6647ddee8837b99 (diff)
downloadkolla-649686584fcc005ec2a49f1ae0698a24d0857aae.tar.gz
kolla-649686584fcc005ec2a49f1ae0698a24d0857aae.zip
Remove the machine-id which cause nova-compute raise exception
Change-Id: I3cfb239e6f99e7079b2781b06550fa627fcb8998 Closes-Bug: #1539064
Diffstat (limited to 'docker/nova')
-rw-r--r--docker/nova/nova-compute/Dockerfile.j23
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index aad9c8ba8..200e2c100 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 }}