Set remove-machine-id to executable

We had previously added an element to remove the machine id from the
images however the script is not executable so it wasn't actually being
run as part of the image building process. This change sets
70-remove-machine-id to be executable so that /etc/machine-id will
actually be removed from the images during the building process.
Additionally this changes the element to clear the file rather than
delete it as if the file is missing, things may not work as expected.

element remove-machine-id has been added to tripleo-common in stable/ocata
and we are experiencing strange issues related to missing /etc/machine-id

Closes-Bug: #1719421

Change-Id: Id3f8c510801f8fcc1fc03415b0ebd23a2ff9da4c
(cherry picked from commit ab7ac88006)
This commit is contained in:
Alex Schultz 2017-08-01 08:22:20 -06:00 committed by Alfredo Moralejo
parent 95348c9c0c
commit 1eeaf432b7
1 changed files with 4 additions and 2 deletions

View File

@ -4,5 +4,7 @@ set -eu
set -o pipefail
# In order to make sure not all nodes have the same machine id, we need to
# remove it from the image and it should be generated on boot. LP#1672461
rm -f /etc/machine-id
# clear it from the image and it should be generated on boot. LP#1672461
# It should be noted that if this file doesn't exist, odd interactions may
# occur.
:> /etc/machine-id