Skip to content

Commit

Permalink
Adding lbaas support for centos in R2.1
Browse files Browse the repository at this point in the history
closes bug: #1380489

Change-Id: Ie08aab28f726caa1001ff8d6047249401a98cab2
  • Loading branch information
Shweta Naik committed Feb 10, 2015
1 parent d7db159 commit 0f55935
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 19 deletions.
Expand Up @@ -24,7 +24,7 @@ makeloc =
package_type = contrail-install-packages

[contrail]
pkgs = contrail-analytics, contrail-config, contrail-control, contrail-lib, contrail-vrouter-agent, contrail-vrouter-source, contrail-vrouter-utils, python-contrail, python-contrail-vrouter-api, contrail-vrouter, contrail-config-openstack, contrail-nova-vif, contrail-utils
pkgs = contrail-analytics, contrail-config, contrail-control, contrail-lib, contrail-vrouter-agent, contrail-vrouter-source, contrail-vrouter-utils, python-contrail, python-contrail-vrouter-api, contrail-vrouter, contrail-config-openstack, contrail-nova-vif, contrail-utils, python-opencontrail-vrouter-netns
makeloc = tools/packaging/common/rpm

[contrail-dns]
Expand Down
90 changes: 73 additions & 17 deletions build/package_configs/centos65/havana/depends_packages.cfg
Expand Up @@ -172,6 +172,26 @@ md5 = d42adbbcac81f2bcf07a171064f0f980
file = dbus-1.2.24-7.el6_3.x86_64.rpm
md5 = ac8760ceb5d92d590e08f9b541501462

[device-mapper-1.02.90-2.el6_6.1]
file = device-mapper-1.02.90-2.el6_6.1.x86_64.rpm
md5 = fcc448948538a5d839fa9bdf0dc2c20c

[device-mapper-event-1.02.90-2.el6_6.1]
file = device-mapper-event-1.02.90-2.el6_6.1.x86_64.rpm
md5 = 332ca679b66f4008c55575e05bb7157b

[device-mapper-event-libs-1.02.90-2.el6_6.1]
file = device-mapper-event-libs-1.02.90-2.el6_6.1.x86_64.rpm
md5 = d1cd8a1040129ff85dc76a7cb04489bd

[device-mapper-libs-1.02.90-2.el6_6.1]
file = device-mapper-libs-1.02.90-2.el6_6.1.x86_64.rpm
md5 = 9b7fa1f27885432f784edd7560f531cb

[docker-io-1.3.2-2.el6]
file = docker-io-1.3.2-2.el6.x86_64.rpm
md5 = 82b638be22911438eccc3bb8dc95c23c

[dmidecode_2.12_5.el6_5]
file = dmidecode-2.12-5.el6_5.x86_64.rpm
md5 = b16c4909e27570d1573bdbb0c71291ca
Expand Down Expand Up @@ -340,6 +360,10 @@ md5 = 48981e56ec5b1a0df6c6aa94454fb24c
file = iscsi-initiator-utils-6.2.0.873-10.el6.x86_64.rpm
md5 = eb6cf6197aff3d3396a7227a5a6fb655

[iproute-3.1.0-contrail.el6]
file = iproute-3.1.0-contrail.el6.x86_64.rpm
md5 = ea1cf8662800ac3a6367601f1869d7eb

[jasper-libs_1.900.1_15.el6_1.1]
file = jasper-libs-1.900.1-15.el6_1.1.x86_64.rpm
md5 = e58633c6ab84807113feca84f8aff363
Expand Down Expand Up @@ -456,9 +480,9 @@ md5 = d148ea6d0ff746ee55b873975914423d
file = libasyncns-0.8-1.1.el6.x86_64.rpm
md5 = 6331378b5beac5765cbdd35ee4a10b9e

[libcgroup_0.40.rc1_5.el6_5.1]
file = libcgroup-0.40.rc1-5.el6_5.1.x86_64.rpm
md5 = 5938dfd9ef30ae0d252c53935b0028a5
[libcgroup-0.40.rc1-15.el6_6]
file = libcgroup-0.40.rc1-15.el6_6.x86_64.rpm
md5 = 112b10b484ff50aacab28b6eff542643

[libdaemon_0.14_1.el6]
file = libdaemon-0.14-1.el6.x86_64.rpm
Expand Down Expand Up @@ -632,6 +656,26 @@ md5 = f1b21546301ddd03032ef6513c35837f
file = lsof-4.82-4.el6.x86_64.rpm
md5 = 88ccb92e56f56cc11bcce6c254c3ecba

[lua-alt-getopt-0.7.0-1.el6]
file = lua-alt-getopt-0.7.0-1.el6.noarch.rpm
md5 = 35ac7422d7a6f06331195e8d23761d64

[lua-filesystem-1.4.2-1.el6]
file = lua-filesystem-1.4.2-1.el6.x86_64.rpm
md5 = 22c9785dfeb497f3175c78768b41f5ff

[lua-lxc-1.0.7-1.el6]
file = lua-lxc-1.0.7-1.el6.x86_64.rpm
md5 = d026c92d2f24b18d2a227fc45171d90a

[lxc-1.0.7-1.el6]
file = lxc-1.0.7-1.el6.x86_64.rpm
md5 = f1ba094a60ae76da5e6b1627ea115ab5

[lxc-libs-1.0.7-1.el6]
file = lxc-libs-1.0.7-1.el6.x86_64.rpm
md5 = 933a36bb81365050324896ae15caaf6a

[lzo_2.03_3.1.el6_5.1]
file = lzo-2.03-3.1.el6_5.1.x86_64.rpm
md5 = 3c969b8d965b60f8cde2484155203f7e
Expand Down Expand Up @@ -940,9 +984,9 @@ md5 = 2a91c4f3a74fa8f1a3e62ae41268ea13
file = python-babel-0.9.4-5.1.el6.noarch.rpm
md5 = 01049224be1b08fe66ae8301591f7b9f

[python-backports-ssl_match_hostname_3.4.0.2_1.el6]
file = python-backports-ssl_match_hostname-3.4.0.2-1.el6.noarch.rpm
md5 = 99edfec68309822283ff87f9bdea65dc
[python-backports-ssl_match_hostname_3.4.0.2-4.el6]
file = python-backports-ssl_match_hostname-3.4.0.2-4.el6.centos.noarch.rpm
md5 = fe41d915fe27eb68b78dd000a4381f00

[python-backports_1.0_4.el6]
file = python-backports-1.0-4.el6.x86_64.rpm
Expand Down Expand Up @@ -1020,9 +1064,9 @@ md5 = a839e681335f9d59534b91d3260e0f7c
file = python-django-openstack-auth-1.1.2-1.el6.noarch.rpm
md5 = b5f8f8f7aa1418764b91a0621b44e275

[python-docker-py-0.6.1_dev-1]
file = python-docker-py-0.6.1_dev-1.noarch.rpm
md5 = 86b23dad98b62d55737e41c7232942ab
[python-docker-py-0.6.0-1.el6]
file = python-docker-py-0.6.0-1.el6.x86_64.rpm
md5 = ad1988449d455cb1f50bd149cc7c87a9

[python-dogpile-cache_0.5.0_1.el6]
file = python-dogpile-cache-0.5.0-1.el6.noarch.rpm
Expand Down Expand Up @@ -1189,8 +1233,8 @@ file = python-oauth2-1.5.211-5.el6.noarch.rpm
md5 = f115cc977bad2e868f0cf8aad6ec80f1

[python-ordereddict_1.1_2.el6]
file = python-ordereddict-1.1-2.el6.noarch.rpm
md5 = d0b5d5717adac363823f77036292c2d5
file = python-ordereddict-1.1-2.el6.centos.noarch.rpm
md5 = 3f97eff1e7c43fb68645c353aba1645c

[python-oslo-config_1.2.1_1.el6]
file = python-oslo-config-1.2.1-1.el6.noarch.rpm
Expand Down Expand Up @@ -1260,9 +1304,9 @@ md5 = 5cd3362e1c289b10d48bfe1eec83470d
file = python-repoze-lru-0.4-3.el6.noarch.rpm
md5 = 44a0a9ee594ba5270bfb24ea7393f6eb

[python-requests_1.1.0_4.el6]
file = python-requests-1.1.0-4.el6.noarch.rpm
md5 = 357ba393303a64ba7ab93f78586a25ad
[python-requests-2.5.1-0.contrail]
file = python-requests-2.5.1-0.contrail.noarch.rpm
md5 = 7db44cdcdde8afb35a0240bc24164347

[python-routes1.12_1.12.3_4.el6]
file = python-routes1.12-1.12.3-4.el6.noarch.rpm
Expand All @@ -1284,9 +1328,9 @@ md5 = e00e7bd03739b7a1d67160ae42bfd365
file = python-simplejson-3.5.3-1.0contrail.x86_64.rpm
md5 = 6077680ff404b14fa980c25da7f28574

[python-six_1.6.1_1.el6]
file = python-six-1.6.1-1.el6.noarch.rpm
md5 = 9d05f45a2bd5750b5c697107229b4bed
[python-six-1.7.3-1.el6]
file = python-six-1.7.3-1.el6.centos.noarch.rpm
md5 = 76b6cca12e805a977ee3f82db126d971

[python-sqlalchemy0.7_0.7.8_1.el6]
file = python-sqlalchemy0.7-0.7.8-1.el6.x86_64.rpm
Expand Down Expand Up @@ -1324,6 +1368,14 @@ md5 = 1998f085fe151b3e09b79980ccb2bae8
file = python-urllib3-1.5-7.el6.noarch.rpm
md5 = 366712332d952a243586a6f0174092d6

[python-unittest2-0.8.0-37.1.contrail]
file = python-unittest2-0.8.0-37.1.contrail.noarch.rpm
md5 = aa74f3c4d83079f249de569deda6f514

[python-websocket-client-0.14.1-3.el6]
file = python-websocket-client-0.14.1-3.el6.noarch.rpm
md5 = 38f00c6db6878390567fe2b7f07545ba

[python-versiontools_1.9.1_3.el6]
file = python-versiontools-1.9.1-3.el6.noarch.rpm
md5 = 2ae3e073d6fa7d27a57bd7c34dec4f06
Expand Down Expand Up @@ -1552,6 +1604,10 @@ md5 = 968ec934a0b0d1836bbb8244cc3e7ebd
file = xz-4.999.9-0.3.beta.20091007git.el6.x86_64.rpm
md5 = 7a3c9bafe5e34128ab9eb8f306689ee4

[xz-libs-4.999.9-0.5.beta.20091007git.el6]
file = xz-libs-4.999.9-0.5.beta.20091007git.el6.x86_64.rpm
md5 = b6b9cf0dbb6dcc952da1e5dc27db4e95

[yajl_1.0.7_3.el6]
file = yajl-1.0.7-3.el6.x86_64.rpm
md5 = 098dd299dc27b5e5859eae1c626cb655
Expand Down
Expand Up @@ -27,7 +27,8 @@ package_type = contrail-install-packages, contrail-packages
pkgs = contrail-analytics, contrail-config, contrail-control,
contrail-lib, contrail-vrouter-agent, contrail-vrouter-source,
contrail-vrouter-utils, python-contrail, python-contrail-vrouter-api,
contrail-vrouter, contrail-config-openstack, contrail-nova-vif, contrail-utils
contrail-vrouter, contrail-config-openstack, contrail-nova-vif, contrail-utils,
python-opencontrail-vrouter-netns
makeloc = tools/packaging/common/rpm

[contrail-dns]
Expand Down
4 changes: 4 additions & 0 deletions common/rpm/contrail-vrouter-common.spec
Expand Up @@ -41,6 +41,10 @@ Requires: contrail-utils >= %{_verstr}-%{_relstr}
Requires: contrail-nodemgr >= %{_verstr}-%{_relstr}
Requires: contrail-vrouter-init >= %{_verstr}-%{_relstr}

%if 0%{?centos}
Requires: python-opencontrail-vrouter-netns >= %{_verstr}-%{_relstr}
%endif

%if 0%{?rhel}
Requires: tunctl
%endif
Expand Down

0 comments on commit 0f55935

Please sign in to comment.