Make "setup.py install" much more thorough. It now installs tools/ into /usr/share/nova and makes sure api-paste.conf lands in /etc/nova rather than /etc.
This commit is contained in:
commit
2899076039
@ -532,6 +532,7 @@ def paste_config_file(basename):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
configfiles = [basename,
|
configfiles = [basename,
|
||||||
|
os.path.join(FLAGS.state_path, 'etc', 'nova', basename),
|
||||||
os.path.join(FLAGS.state_path, 'etc', basename),
|
os.path.join(FLAGS.state_path, 'etc', basename),
|
||||||
os.path.join(FLAGS.state_path, basename),
|
os.path.join(FLAGS.state_path, basename),
|
||||||
'/etc/nova/%s' % basename]
|
'/etc/nova/%s' % basename]
|
||||||
|
15
setup.py
15
setup.py
@ -16,6 +16,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
import glob
|
||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
@ -86,6 +87,19 @@ try:
|
|||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def find_data_files(destdir, srcdir):
|
||||||
|
package_data = []
|
||||||
|
files = []
|
||||||
|
for d in glob.glob('%s/*' % (srcdir, )):
|
||||||
|
if os.path.isdir(d):
|
||||||
|
package_data += find_data_files(
|
||||||
|
os.path.join(destdir, os.path.basename(d)), d)
|
||||||
|
else:
|
||||||
|
files += [d]
|
||||||
|
package_data += [(destdir, files)]
|
||||||
|
return package_data
|
||||||
|
|
||||||
DistUtilsExtra.auto.setup(name='nova',
|
DistUtilsExtra.auto.setup(name='nova',
|
||||||
version=version.canonical_version_string(),
|
version=version.canonical_version_string(),
|
||||||
description='cloud computing fabric controller',
|
description='cloud computing fabric controller',
|
||||||
@ -96,6 +110,7 @@ DistUtilsExtra.auto.setup(name='nova',
|
|||||||
packages=find_packages(exclude=['bin', 'smoketests']),
|
packages=find_packages(exclude=['bin', 'smoketests']),
|
||||||
include_package_data=True,
|
include_package_data=True,
|
||||||
test_suite='nose.collector',
|
test_suite='nose.collector',
|
||||||
|
data_files=find_data_files('share/nova', 'tools'),
|
||||||
scripts=['bin/nova-ajax-console-proxy',
|
scripts=['bin/nova-ajax-console-proxy',
|
||||||
'bin/nova-api',
|
'bin/nova-api',
|
||||||
'bin/nova-compute',
|
'bin/nova-compute',
|
||||||
|
Loading…
Reference in New Issue
Block a user