Comment 2 for bug 1585528

Revision history for this message
Oleg S. Gelbukh (gelbuhos) wrote :

From what I can see, handling of MANIFEST.in file for 8.0.0+ versions was changed recently. In 7.0.0 version, package has all the patches recursively:

$ rpm -qlp fuel-octane-7.0.0-1110.1.git39b75e2.noarch.rpm | grep patch
warning: fuel-octane-7.0.0-1110.1.git39b75e2.noarch.rpm: Header V4 RSA/SHA1 Signature, key ID 3e301371: NOKEY
/usr/lib/python2.6/site-packages/octane/helpers/docker_patch.py
/usr/lib/python2.6/site-packages/octane/helpers/docker_patch.pyc
/usr/lib/python2.6/site-packages/octane/helpers/docker_patch.pyo
/usr/lib/python2.6/site-packages/octane/patches
/usr/lib/python2.6/site-packages/octane/patches/fuel_agent
/usr/lib/python2.6/site-packages/octane/patches/fuel_agent/patch
/usr/lib/python2.6/site-packages/octane/patches/nailgun-clone-ips.patch
/usr/lib/python2.6/site-packages/octane/patches/neutron-template.tar
/usr/lib/python2.6/site-packages/octane/patches/neutron-upgrade.patch
/usr/lib/python2.6/site-packages/octane/patches/nova.conf
/usr/lib/python2.6/site-packages/octane/patches/pman
/usr/lib/python2.6/site-packages/octane/patches/pman/erase_node.rb.patch
/usr/lib/python2.6/site-packages/octane/patches/pman/update_node.sh
/usr/lib/python2.6/site-packages/octane/patches/puppet
/usr/lib/python2.6/site-packages/octane/patches/puppet/ceph
/usr/lib/python2.6/site-packages/octane/patches/puppet/ceph/patch
/usr/lib/python2.6/site-packages/octane/patches/puppet/revert.sh
/usr/lib/python2.6/site-packages/octane/patches/puppet/update.sh
/usr/lib/python2.6/site-packages/octane/patches/timeout.patch
/usr/lib/python2.6/site-packages/octane/patches/update_node_partition_info.py
/usr/lib/python2.6/site-packages/octane/patches/update_node_partition_info.pyc
/usr/lib/python2.6/site-packages/octane/patches/update_node_partition_info.pyo
/usr/lib/python2.6/site-packages/octane/tests/test_patch_puppet.py
/usr/lib/python2.6/site-packages/octane/tests/test_patch_puppet.pyc
/usr/lib/python2.6/site-packages/octane/tests/test_patch_puppet.pyo

While the 8.0.0 package only includes the top-level files from the directory:

$ rpm -qlp fuel-octane-8.0.0-1.mos1145.noarch.rpm | grep patch
warning: fuel-octane-8.0.0-1.mos1145.noarch.rpm: Header V4 RSA/SHA1 Signature, key ID 1fa22b08: NOKEY
/usr/lib/python2.7/site-packages/octane/helpers/docker_patch.py
/usr/lib/python2.7/site-packages/octane/helpers/docker_patch.pyc
/usr/lib/python2.7/site-packages/octane/helpers/docker_patch.pyo
/usr/lib/python2.7/site-packages/octane/patches/nailgun-clone-ips.patch
/usr/lib/python2.7/site-packages/octane/patches/neutron-template.tar
/usr/lib/python2.7/site-packages/octane/patches/neutron-upgrade.patch
/usr/lib/python2.7/site-packages/octane/patches/nova.conf
/usr/lib/python2.7/site-packages/octane/patches/timeout.patch
/usr/lib/python2.7/site-packages/octane/patches/update_node_partition_info.py
/usr/lib/python2.7/site-packages/octane/patches/update_node_partition_info.pyc
/usr/lib/python2.7/site-packages/octane/patches/update_node_partition_info.pyo
/usr/lib/python2.7/site-packages/octane/tests/test_patch_puppet.py
/usr/lib/python2.7/site-packages/octane/tests/test_patch_puppet.pyc
/usr/lib/python2.7/site-packages/octane/tests/test_patch_puppet.pyo
/usr/lib/python2.7/site-packages/octane/util/patch.py
/usr/lib/python2.7/site-packages/octane/util/patch.pyc
/usr/lib/python2.7/site-packages/octane/util/patch.pyo

MANIFEST.in file is identical for both versions, as you can see:

https://github.com/openstack/fuel-octane/blob/stable/8.0/MANIFEST.in
cf.
https://github.com/openstack/fuel-octane/blob/stable/7.0/MANIFEST.in