commit 1eeaf432b7be2571ac53330c45d96f68ffae5a5d
Author: Alex Schultz <email address hidden>
Date: Tue Aug 1 08:22:20 2017 -0600
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 ab7ac88006c6c26bbebbe6862792f89d34a65236)
Reviewed: https:/ /review. openstack. org/507495 /git.openstack. org/cgit/ openstack/ tripleo- puppet- elements/ commit/ ?id=1eeaf432b7b e2571ac53330c45 d96f68ffae5a5d
Committed: https:/
Submitter: Jenkins
Branch: stable/ocata
commit 1eeaf432b7be257 1ac53330c45d96f 68ffae5a5d
Author: Alex Schultz <email address hidden>
Date: Tue Aug 1 08:22:20 2017 -0600
Set remove-machine-id to executable
We had previously added an element to remove the machine id from the remove- machine- id to be executable so that /etc/machine-id will
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-
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: Id3f8c510801f8f cc1fc03415b0ebd 23a2ff9da4c bbebbe6862792f8 9d34a65236)
(cherry picked from commit ab7ac88006c6c26