Skip to content

Commit

Permalink
Storage package fix
Browse files Browse the repository at this point in the history 
Closes-Bug: #1525466
Ceph released source has reference to ceph-deploy man page.
This causes installation error when both the packages are installed.
Removed the reference to the ceph-deploy man page from ceph package.

Change-Id: I05d1c929c11de83eccea8c6d777c3407deefacb8
  • Loading branch information
Jeya ganesh babu J committed Dec 30, 2015
1 parent 8595222 commit b142afc
Showing 1 changed file with 60 additions and 52 deletions.
112 changes: 60 additions & 52 deletions build/package_configs/ubuntu1404/juno/depends_storage_packages.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,60 @@
# ****************************************************************
# CAUTION: ANY CHANGES TO DEFAULT APPLIES TO ALL SECTIONS
# ****************************************************************************
# CAUTION: ANY CHANGES TO DEFAULT SECTION APPLIES TO ALL SECTIONS
# IF NOT OVERWRITTEN LOCALLY
# ****************************************************************
# ****************************************************************************
# Usage:
# [package name]
# file = # name of the package
# location = # location where the package file is available
# md5 = # md5 check sum of the package file
# file = # file name of the package
#
# *****************************************************************
# location = # location where the package file is available.
# # If location is empty, default value is applied
# # Default value = <cache-base-dir>/<os-dist>/<sku>/ and
# # its sub directories
#
# md5 = # md5 check sum of the package file
#
# package_type = # wrapper package name in which this package will be
# # packaged
# # eg. If a section has package_type - contrail-dependent-packages
# # then that package file will be packaged in
# # the wrapper package contrail-dependent-packages
#
# ****************************************************************************

[DEFAULT]
file =
md5 =
location =
package_type = contrail-storage-packages

[storage-ceph-common_0.94.3-1contrail1]
file = ceph-common_0.94.3-1contrail1_amd64.deb
md5 = 5d09dd669f16bee30a62d33648d36ccd
[storage-ceph-common_0.94.3-1contrail2]
file = ceph-common_0.94.3-1contrail2_amd64.deb
md5 = 10e341b3089bc708b803ab84894e8872
source = repo:contrail-thirdparty

[storage-ceph-deploy_1.4.0-0ubuntu1]
file = ceph-deploy_1.4.0-0ubuntu1_all.deb
md5 = 106ff343c0df2c8e7d0245d0482269ab
source = repo:trusty/universe

[storage-ceph-fs-common_0.94.3-1contrail1]
file = ceph-fs-common_0.94.3-1contrail1_amd64.deb
md5 = c36c107e2b41448bca08e7a859270a94
[storage-ceph-fs-common_0.94.3-1contrail2]
file = ceph-fs-common_0.94.3-1contrail2_amd64.deb
md5 = 62dec47e84ba95c08f526e47dc113fc5
source = repo:contrail-thirdparty

[storage-ceph-fuse_0.94.3-1contrail1]
file = ceph-fuse_0.94.3-1contrail1_amd64.deb
md5 = 5bd64fcca5fc4f01db106a6c16177986
[storage-ceph-fuse_0.94.3-1contrail2]
file = ceph-fuse_0.94.3-1contrail2_amd64.deb
md5 = 00506bce0997184bb47611d788758065
source = repo:contrail-thirdparty

[storage-ceph-mds_0.94.3-1contrail1]
file = ceph-mds_0.94.3-1contrail1_amd64.deb
md5 = 85f4ffbe4e3aae9401c35536ca4a5773
[storage-ceph-mds_0.94.3-1contrail2]
file = ceph-mds_0.94.3-1contrail2_amd64.deb
md5 = 1fe61de80ffd766e333168be1ad089ac
source = repo:contrail-thirdparty

[storage-ceph_0.94.3-1contrail1]
file = ceph_0.94.3-1contrail1_amd64.deb
md5 = 7e39a28db656237a227ab408bb89c084
[storage-ceph_0.94.3-1contrail2]
file = ceph_0.94.3-1contrail2_amd64.deb
md5 = 48da333273979870e3257f1499736632
source = repo:contrail-thirdparty

[storage-cinder-volume_1:2014.2.3-0ubuntu1.1~cloud0]
Expand Down Expand Up @@ -76,9 +87,9 @@ file = heirloom-mailx_12.5-2+deb7u1build0.14.04.1_amd64.deb
md5 = 9e8badc74dfbfe379e3520f343ac93a0
source = repo:trusty-updates/universe

[storage-libcephfs1_0.94.3-1contrail1]
file = libcephfs1_0.94.3-1contrail1_amd64.deb
md5 = 91e50c3b53b6ed921439375ed9507ead
[storage-libcephfs1_0.94.3-1contrail2]
file = libcephfs1_0.94.3-1contrail2_amd64.deb
md5 = 8ba277867d37b4ec3b386948e052b4d8
source = repo:contrail-thirdparty

[storage-libconfig-general-perl_2.52-1]
Expand Down Expand Up @@ -161,14 +172,14 @@ file = libntlm0_1.4-1_amd64.deb
md5 = 494a0ba5d16fe739b2ca575e7177604a
source = repo:trusty/universe

[storage-librados2_0.94.3-1contrail1]
file = librados2_0.94.3-1contrail1_amd64.deb
md5 = 18f2d8e2025d4d82942e9308fb03e351
[storage-librados2_0.94.3-1contrail2]
file = librados2_0.94.3-1contrail2_amd64.deb
md5 = b0c8edeaa07ec8593228bfc0197612e1
source = repo:contrail-thirdparty

[storage-librbd1_0.94.3-1contrail1]
file = librbd1_0.94.3-1contrail1_amd64.deb
md5 = 9559c12981b2f899fbe8526fb128bbfa
[storage-librbd1_0.94.3-1contrail2]
file = librbd1_0.94.3-1contrail2_amd64.deb
md5 = 72c9408b09aacd955b193d3608b6162c
source = repo:contrail-thirdparty

[storage-librdmacm1_1.0.16-1]
Expand Down Expand Up @@ -226,14 +237,14 @@ file = python-blinker_1.3.dfsg1-1ubuntu2_all.deb
md5 = 1084d75f917fed1cd00fe11edd5695e6
source = repo:trusty/main

[storage-python-ceph_0.94.3-1contrail1]
file = python-ceph_0.94.3-1contrail1_amd64.deb
md5 = e4fece0e704953344e8cbdf8e1f4285b
[storage-python-ceph_0.94.3-1contrail2]
file = python-ceph_0.94.3-1contrail2_amd64.deb
md5 = 2735079b2d05461307733be9a6319b2b
source = repo:contrail-thirdparty

[storage-python-cephfs_0.94.3-1contrail1]
file = python-cephfs_0.94.3-1contrail1_amd64.deb
md5 = cb113cc28bf9cf3eac7b4393f2d7f7aa
[storage-python-cephfs_0.94.3-1contrail2]
file = python-cephfs_0.94.3-1contrail2_amd64.deb
md5 = 2ea0fed7128da9d62aa18b51d44fdea2
source = repo:contrail-thirdparty

[storage-python-flask_0.10.1-2build1]
Expand All @@ -256,29 +267,29 @@ file = python-pyinotify_0.9.4-1build1_all.deb
md5 = e8769aea55a94fe0562f7c5fc160f883
source = repo:trusty/main

[storage-python-rados_0.94.3-1contrail1]
file = python-rados_0.94.3-1contrail1_amd64.deb
md5 = 8eb0b8cbeda4137917cbfe65ec832e99
[storage-python-rados_0.94.3-1contrail2]
file = python-rados_0.94.3-1contrail2_amd64.deb
md5 = 5b481f7b712c098672a191cb43fd5a2b
source = repo:contrail-thirdparty

[storage-python-rbd_0.94.3-1contrail1]
file = python-rbd_0.94.3-1contrail1_amd64.deb
md5 = 46d8966ce33078293ad46b55fdca90bd
[storage-python-rbd_0.94.3-1contrail2]
file = python-rbd_0.94.3-1contrail2_amd64.deb
md5 = 8b058b2398da59a1dc4f39fe95b5b2d2
source = repo:contrail-thirdparty

[storage-python-werkzeug_0.9.4+dfsg-1.1ubuntu2]
file = python-werkzeug_0.9.4+dfsg-1.1ubuntu2_all.deb
md5 = 0b840568dce7365757d1146c8570466c
source = repo:trusty-updates/main

[storage-radosgw_0.94.3-1contrail1]
file = radosgw_0.94.3-1contrail1_amd64.deb
md5 = 6956e0554346f8a237ce0bb1d9269023
[storage-radosgw_0.94.3-1contrail2]
file = radosgw_0.94.3-1contrail2_amd64.deb
md5 = feaa72dbc1f1818ed3115ebb925ad6bc
source = repo:contrail-thirdparty

[storage-rbd-fuse_0.94.3-1contrail1]
file = rbd-fuse_0.94.3-1contrail1_amd64.deb
md5 = 5470b30b93e0e70e6f2c7c11f034cd54
[storage-rbd-fuse_0.94.3-1contrail2]
file = rbd-fuse_0.94.3-1contrail2_amd64.deb
md5 = 7e3fbf8ca8d3fa53d1b672b3953be908
source = repo:contrail-thirdparty

[storage-readline-common_6.3-4ubuntu2]
Expand Down Expand Up @@ -331,6 +342,3 @@ file = xfsprogs_3.1.9ubuntu2_amd64.deb
md5 = cd7af43d46ad3eca3839ded13f2a0129
source = repo:trusty/main

[sysfsutils]
file = sysfsutils_2.1.0+repack-3ubuntu1_amd64.deb
md5 = 641ba8cee477cdcf99f3e6b13cbd7c3d

0 comments on commit b142afc

Please sign in to comment.