From f62e8f966d89e1be3825a9fd6d23a02a52981a0e Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 13 Mar 2017 14:39:06 -0600 Subject: [PATCH] Remove machine-id from image We should not be providing a machine-id in the overcloud images, so use the remove-machine-id element to make sure it is cleaned from the overcloud image during the build process. Change-Id: I1d4f86ca9f173195ac4477be43b62a0ce388cc79 Depends-On: Id3f8c510801f8fcc1fc03415b0ebd23a2ff9da4c Closes-Bug: #1672461 (cherry picked from commit 44ff6913a2dcaf9c49088b6dae73cc37a3ee9b21) (cherry picked from commit a96721ad721e400f474b2032022f930a2d2a6cf4) --- image-yaml/overcloud-images.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-yaml/overcloud-images.yaml b/image-yaml/overcloud-images.yaml index 2a9e93e21..5fe6d6efe 100644 --- a/image-yaml/overcloud-images.yaml +++ b/image-yaml/overcloud-images.yaml @@ -4,7 +4,7 @@ disk_images: arch: amd64 type: qcow2 elements: - - hosts baremetal dhcp-all-interfaces os-collect-config overcloud-full overcloud-controller overcloud-compute overcloud-ceph-storage puppet-modules hiera os-net-config stable-interface-names grub2 element-manifest network-gateway dynamic-login enable-packages-install pip-and-virtualenv-override + - hosts baremetal dhcp-all-interfaces os-collect-config overcloud-full overcloud-controller overcloud-compute overcloud-ceph-storage puppet-modules hiera os-net-config stable-interface-names grub2 element-manifest network-gateway dynamic-login enable-packages-install pip-and-virtualenv-override remove-machine-id packages: - python-psutil - python-debtcollector