From d744d208cf2516f00a15de37413bb01eb8b3674d Mon Sep 17 00:00:00 2001 From: Vinay Vithal Mahuli Date: Wed, 22 Apr 2015 11:59:01 -0700 Subject: [PATCH] Revert "Cloud changes for packaging" This reverts commit 242eb4171a9c207d51659f1d2c30658bdf8802f2 --- build/libs/packager/common.py | 11 --- .../ubuntu1204/havana/contrail_packages.cfg | 53 ++++--------- .../ubuntu1204/havana/depends_packages.cfg | 44 ++++------- .../ubuntu1204/icehouse/contrail_packages.cfg | 39 ++++------ .../ubuntu1204/icehouse/depends_packages.cfg | 44 ++++------- .../ubuntu1404/icehouse/contrail_packages.cfg | 39 ++++------ .../ubuntu1404/icehouse/depends_packages.cfg | 41 ++++------ .../ubuntu1404/juno/contrail_packages.cfg | 37 ++++----- .../ubuntu1404/juno/depends_packages.cfg | 50 ++++-------- build/setup_ubuntu1404_installer_pkg.sh | 44 ----------- build/setup_ubuntu1404_split_pkgs.sh | 48 ++++++++++-- build/setup_ubuntu_installer_pkg.sh | 38 --------- build/setup_ubuntu_juno_installer_pkg.sh | 42 ---------- build/setup_ubuntu_juno_split_pkgs.sh | 52 +++++++++++-- build/setup_ubuntu_split_pkgs.sh | 47 +++++++++-- common/debian/Makefile | 10 --- .../debian/contrail-dependent-packages.postrm | 6 +- .../debian/contrail-fabric-utils/debian/rules | 4 - .../debian/changelog | 6 ++ .../debian/changelog.in | 6 +- .../contrail-install-packages/debian/control | 4 +- .../debian/copyright | 2 +- .../contrail-install-packages/debian/rules | 25 +++--- .../debian/changelog.in | 6 -- .../contrail-installer-package/debian/compat | 1 - .../contrail-installer-package/debian/control | 15 ---- .../debian/copyright | 5 -- .../contrail-installer-package/debian/rules | 77 ------------------- .../debian/contrail-openstack-packages.postrm | 6 +- .../debian/contrail-packages.postrm | 6 +- common/debian/contrail-packages/debian/rules | 1 + common/debian/contrail-setup/debian/rules | 3 + .../contrail-thirdparty-packages.postrm | 6 +- 33 files changed, 284 insertions(+), 534 deletions(-) delete mode 100644 build/setup_ubuntu1404_installer_pkg.sh delete mode 100644 build/setup_ubuntu_installer_pkg.sh delete mode 100644 build/setup_ubuntu_juno_installer_pkg.sh create mode 100755 common/debian/contrail-install-packages/debian/changelog delete mode 100755 common/debian/contrail-installer-package/debian/changelog.in delete mode 100755 common/debian/contrail-installer-package/debian/compat delete mode 100755 common/debian/contrail-installer-package/debian/control delete mode 100755 common/debian/contrail-installer-package/debian/copyright delete mode 100755 common/debian/contrail-installer-package/debian/rules diff --git a/build/libs/packager/common.py b/build/libs/packager/common.py index 9e728b16e..14d44dd34 100755 --- a/build/libs/packager/common.py +++ b/build/libs/packager/common.py @@ -75,21 +75,10 @@ def ks_build(self): pkgtypes = list(set(sorted(contrail_pkgs_dict.keys() + depends_pkgs_dict.keys() + base_pkgs_dict.keys()))) - if 'contrail-install-packages' in pkgtypes: pkgtypes.remove('contrail-install-packages') pkgtypes = ['contrail-install-packages'] + pkgtypes - print pkgtypes - if 'contrail-packages' in pkgtypes: - pkgtypes.remove('contrail-packages') - pkgtypes = ['contrail-packages'] + pkgtypes - print pkgtypes - if 'contrail-install-packages' in pkgtypes: - pkgtypes.remove('contrail-install-packages') - pkgtypes = pkgtypes + ['contrail-install-packages'] - print pkgtypes - # create packager stores self.create_dir(self.store) self.create_dir(self.store_log_dir) diff --git a/build/package_configs/ubuntu1204/havana/contrail_packages.cfg b/build/package_configs/ubuntu1204/havana/contrail_packages.cfg index 2012cd766..78d6d604a 100644 --- a/build/package_configs/ubuntu1204/havana/contrail_packages.cfg +++ b/build/package_configs/ubuntu1204/havana/contrail_packages.cfg @@ -21,7 +21,7 @@ pkg_pattern = {pkg}_[0-9]*.deb builtloc = build/debian/ target = %(__name__)s makeloc = -package_type = contrail-packages +package_type = contrail-install-packages, contrail-packages [contrail] pkgs = contrail-analytics, contrail-config, contrail-control, contrail-lib, @@ -68,42 +68,41 @@ makeloc = tools/packaging/common/debian [contrail-fabric-utils-deb] pkgs = contrail-fabric-utils makeloc = tools/packaging/common/debian -package_type = contrail-installer-package [contrail-openstack-deb] pkgs = contrail-openstack makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-analytics-deb] pkgs = contrail-openstack-analytics makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-config-deb] pkgs = contrail-openstack-config makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-control-deb] pkgs = contrail-openstack-control makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-database-deb] pkgs = contrail-openstack-database makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-vrouter-deb] pkgs = contrail-openstack-vrouter makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-webui-deb] pkgs = contrail-openstack-webui makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [ifmap-server] pkgs = ifmap-server @@ -118,7 +117,7 @@ builtloc = build/packages [contrail-openstack-dashboard-deb] pkgs = contrail-openstack-dashboard makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-ostack-dashboard-deb] pkgs = openstack-dashboard @@ -132,13 +131,11 @@ makeloc = tools/packaging/common/debian pkgs = python-neutronclient makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages [neutron-common-deb] pkgs = neutron-common makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages [neutron-plugin-contrail-deb] pkgs = neutron-plugin-contrail @@ -149,91 +146,71 @@ builtloc = build/debian/ pkgs = neutron-server makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages [python-neutron-deb] pkgs = python-neutron makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages [nova-api-deb] pkgs = nova-api makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages [nova-cells-deb] pkgs = nova-cells makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages [nova-common-deb] pkgs = nova-common makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages [nova-compute-deb] pkgs = nova-compute makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages [nova-compute-kvm-deb] pkgs = nova-compute-kvm makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages [nova-conductor-deb] pkgs = nova-conductor makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages [nova-console-deb] pkgs = nova-console makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages [nova-consoleauth-deb] pkgs = nova-consoleauth makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages [nova-novncproxy-deb] pkgs = nova-novncproxy makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages [nova-objectstore-deb] pkgs = nova-objectstore makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages [nova-scheduler-deb] pkgs = nova-scheduler makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages [python-nova-deb] pkgs = python-nova makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages - -[contrail-installer-package] -pkgs = contrail-installer-package -makeloc = tools/packaging/common/debian -target = contrail-installer-package-deb -package_type = contrail-installer-package [contrail-install-packages] pkgs = contrail-install-packages @@ -244,36 +221,36 @@ package_type = contrail-install-packages [contrail-packages] pkgs = contrail-packages makeloc = tools/packaging/common/debian -package_type = contrail-packages, contrail-install-packages +package_type = contrail-packages [contrail-thirdparty-packages] pkgs = contrail-thirdparty-packages makeloc = tools/packaging/common/debian -package_type = contrail-thirdparty-packages, contrail-install-packages +package_type = contrail-thirdparty-packages [contrail-dependent-packages] pkgs = contrail-dependent-packages makeloc = tools/packaging/common/debian -package_type = contrail-dependent-packages, contrail-install-packages +package_type = contrail-dependent-packages [contrail-openstack-packages] pkgs = contrail-openstack-packages makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages, contrail-install-packages +package_type = contrail-openstack-packages [openstack-default-target] pkgs = makeloc = tools/packaging/openstack/debian target = all builtloc = build/openstack/ -package_type = contrail-openstack-packages +package_type = contrail-install-packages [contrail-default-target] pkgs = makeloc = tools/packaging/common/debian/ target = all builtloc = build/debian/ -package_type = contrail-packages +package_type = contrail-install-packages [contrail-openstack-ha-deb] pkgs = contrail-openstack-ha diff --git a/build/package_configs/ubuntu1204/havana/depends_packages.cfg b/build/package_configs/ubuntu1204/havana/depends_packages.cfg index ad6c4c347..13578d2a7 100644 --- a/build/package_configs/ubuntu1204/havana/depends_packages.cfg +++ b/build/package_configs/ubuntu1204/havana/depends_packages.cfg @@ -14,7 +14,7 @@ file = md5 = location = -package_type = contrail-dependent-packages +package_type = contrail-install-packages, contrail-dependent-packages [acl] file = acl_2.2.51-5ubuntu1_amd64.deb @@ -39,7 +39,6 @@ md5 = 36494701362f53bf19583d803eaf1762 [binutils] file = binutils_2.22-6ubuntu1.1_amd64.deb md5 = 4abcede722bd28bd70fe6f6016346bf1 -package_type = contrail-installer-package [bridge-utils] file = bridge-utils_1.5-2ubuntu7_amd64.deb @@ -96,7 +95,6 @@ md5 = 2af1b08b6fe69aa1fd6b7142cd403c27 [dpkg-dev] file = dpkg-dev_1.16.1.2ubuntu7.2_all.deb md5 = 0a47b68a9363e0214c56663d8c10e77d -package_type = contrail-installer-package [ebtables] file = ebtables_2.0.9.2-2ubuntu2_amd64.deb @@ -165,7 +163,7 @@ md5 = 55a6c3ca89e64dc2da86a3876f24a3ba [kafka_2.9.2-0.8.2.0] file = kafka_2.9.2-0.8.2.0-0contrail0_amd64.deb md5 = 0745dfaf82159b8c1625b82249320db4 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-consistent-hash_1.0] file = python-consistent-hash_1.0-0contrail1_amd64.deb @@ -330,7 +328,6 @@ md5 = 716994b4b704545103f6a40d600607bb [libdpkg-perl] file = libdpkg-perl_1.16.1.2ubuntu7.2_all.deb md5 = bd2e01f09ab9ae26a85121b5ae83a5d9 -package_type = contrail-installer-package [libevent-2.0-5] file = libevent-2.0-5_2.0.16-stable-1_amd64.deb @@ -463,12 +460,12 @@ md5 = 05ab08615f59642b06489a55dcbb03e0 [librdkafka1_0.8.5] file = librdkafka1_0.8.5-2-0contrail0_amd64.deb md5 = 65a5960a450ed56862f8535699077d30 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [librdkafka-dev_0.8.5] file = librdkafka-dev_0.8.5-2-0contrail0_amd64.deb md5 = 4c4324853279361e904927cdeb04da9a -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [libkrb5-26-heimdal] file = libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2ubuntu0.1_amd64.deb @@ -773,7 +770,6 @@ md5 = 3ffd2bb6dfa0382b35482ea2a55e645d [libyaml-0-2] file = libyaml-0-2_0.1.4-2ubuntu0.12.04.1_amd64.deb md5 = b78b207c7de80db820e81a8fcceb6fbb -package_type = contrail-installer-package [libzookeeper-java] file = libzookeeper-java_3.4.5+dfsg-1_all.deb @@ -802,7 +798,6 @@ md5 = 50d50dca05c32e48d457e4b9a5998af3 [make] file = make_3.81-8.1ubuntu1.1_amd64.deb md5 = 204a7b26f38f0377d0bf61940f3d524e -package_type = contrail-installer-package [manpages-dev] file = manpages-dev_3.35-0.1ubuntu1_all.deb @@ -843,7 +838,6 @@ md5 = 808e159ab1fdc20406bc9d7475517783 [patch] file = patch_2.6.1-3_amd64.deb md5 = b5aada57a1902713e2bfa906636081b1 -package_type = contrail-installer-package [python-amqp] file = python-amqp_1.0.12-0ubuntu1~cloud0_all.deb @@ -868,12 +862,12 @@ md5 = 447530b39359fc0e66a3ba37de4d4a05 [python-backports.ssl-match-hostname] file = python-backports.ssl-match-hostname_3.4.0.2-1contrail1_all.deb md5 = 243c920a5c91d12801c525f3dcd2a6d1 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-bitarray] file = python-bitarray_0.8.0-2contrail1_amd64.deb md5 = 00e657063f69a9122b6eaff7bacd75c8 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-carrot] file = python-carrot_0.10.7-1ubuntu1_all.deb @@ -882,7 +876,7 @@ md5 = d211336651734cff31a322515bb25ace [python-certifi] file = python-certifi_1.0.1-1contrail1_all.deb md5 = 46ab19b4096c653c10854f5c5e735f1c -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-cheetah] file = python-cheetah_2.4.4-2ubuntu3_amd64.deb @@ -963,7 +957,7 @@ md5 = ff971c30c90856c2efcf5ed17a0f4b53 [python-geventhttpclient] file = python-geventhttpclient_1.1.0-1contrail1_amd64.deb md5 = 1a00d30b23e355a014e90b75243f3227 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-gflags] file = python-gflags_1.5.1-1build1_all.deb @@ -1012,12 +1006,12 @@ md5 = bca2b8a7e67d16014ee4f2d2deb6f004 [python-kafka-python_0.9.2] file = python-kafka-python_0.9.2-0contrail0_all.deb md5 = ca72ef4061c3f6a6a1c4f3b3e1b3bc84 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-kazoo] file = python-kazoo_1.3.1-1contrail2_all.deb md5 = 1160ffdc6faa72bfb6f027f5e7b18bb1 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-keyring] file = python-keyring_0.9.2-0ubuntu0.12.04.2_all.deb @@ -1058,7 +1052,7 @@ md5 = d09be60be35f10ae9e03bfb87ac73c00 [python-lxml] file = python-lxml_3.3.1-1contrail1_amd64.deb md5 = 7c3cff6ae352621381d11bd43ab7e399 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-m2crypto] file = python-m2crypto_0.21.1-2ubuntu2_amd64.deb @@ -1091,7 +1085,7 @@ md5 = 6057fd4d65abae12ef81ebf078d2fb34 [python-ncclient] file = python-ncclient_0.4.1-1contrail1_all.deb md5 = fbf835d94c89850e07c5d4c64390691b -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-mysqldb] file = python-mysqldb_1.2.3-1ubuntu0.1_amd64.deb @@ -1160,12 +1154,10 @@ md5 = 55c1bf6b28f9f3f4d3f9dd22932468dc [python-pip] file = python-pip_1.0-1build1_all.deb md5 = 55dc8bbb9f99b65d1cb0230f3126ae79 -package_type = contrail-installer-package [python-pkg-resources] file = python-pkg-resources_0.6.24-1ubuntu1_all.deb md5 = 0e5af037ec2a08c4a992675f32d9f56e -package_type = contrail-installer-package [python-prettytable] file = python-prettytable_0.6.1-1ubuntu1~cloud0_all.deb @@ -1186,7 +1178,7 @@ md5 = 09fb9dfd6a8ac7926b61742aff54cc2d [python-pycassa] file = python-pycassa_1.11.0-1contrail2_all.deb md5 = 251c53af490a46086da56c9286b403e2 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-pycurl] file = python-pycurl_7.19.0-4ubuntu3_amd64.deb @@ -1207,7 +1199,7 @@ md5 = be32aa308d2123a1391ad7345af644d4 [python-redis] file = python-redis_2.8.0-1contrail1_all.deb md5 = a2c82a2b974ed10471570c09aef0673d -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-requests_2.2.1-1~cloud1] file = python-requests_2.2.1-1~cloud1_all.deb @@ -1224,7 +1216,6 @@ md5 = c4522ec41469152ca60f5183e386df11 [python-setuptools] file = python-setuptools_0.6.24-1ubuntu1_all.deb md5 = 3b89564b0ae0d40087686f1e464cfe21 -package_type = contrail-installer-package [python-simplejson] file = python-simplejson_3.3.0-2ubuntu2~cloud1_amd64.deb @@ -1249,7 +1240,7 @@ md5 = 35385e306a965b8b59f2d2f725710471 [python-stevedore] file = python-stevedore_0.14.1-1contrail4_all.deb md5 = 31c931ee9a8c0e047d52f31b7e61254d -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-stompy] file = python-stompy_0.2.9-1ubuntu1_all.deb @@ -1302,12 +1293,11 @@ md5 = 15d218b78c003131153064b942418b1c [python-xmltodict] file = python-xmltodict_0.9.0-1contrail1_all.deb md5 = 49ad578daa539e8965bbcaaac9a8045e -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-yaml] file = python-yaml_3.10-2_amd64.deb md5 = 1a75f120b87c80c03bcdbe766cb23233 -package_type = contrail-installer-package [python-zope.interface] file = python-zope.interface_3.6.1-1ubuntu3_amd64.deb @@ -2032,7 +2022,7 @@ md5 = 45d9ef64554e436b29ffcf85c79e099c [nodejs] file = nodejs_0.8.15-1contrail1_amd64.deb md5 = 266a7423da197d044000d3e389dd5aff -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [authbind] file = authbind_1.2.0build3_amd64.deb diff --git a/build/package_configs/ubuntu1204/icehouse/contrail_packages.cfg b/build/package_configs/ubuntu1204/icehouse/contrail_packages.cfg index 111f4b793..5c3e22aeb 100644 --- a/build/package_configs/ubuntu1204/icehouse/contrail_packages.cfg +++ b/build/package_configs/ubuntu1204/icehouse/contrail_packages.cfg @@ -21,7 +21,7 @@ pkg_pattern = {pkg}_[0-9]*.deb builtloc = build/debian/ target = %(__name__)s makeloc = -package_type = contrail-packages +package_type = contrail-install-packages, contrail-packages [contrail] pkgs = contrail-analytics, contrail-config, contrail-control, contrail-lib, @@ -72,42 +72,41 @@ makeloc = tools/packaging/common/debian [contrail-fabric-utils-deb] pkgs = contrail-fabric-utils makeloc = tools/packaging/common/debian -package_type = contrail-installer-package [contrail-openstack-deb] pkgs = contrail-openstack makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-analytics-deb] pkgs = contrail-openstack-analytics makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-config-deb] pkgs = contrail-openstack-config makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-control-deb] pkgs = contrail-openstack-control makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-database-deb] pkgs = contrail-openstack-database makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-vrouter-deb] pkgs = contrail-openstack-vrouter makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-webui-deb] pkgs = contrail-openstack-webui makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [ifmap-server] pkgs = ifmap-server @@ -122,7 +121,7 @@ builtloc = build/packages [contrail-openstack-dashboard-deb] pkgs = contrail-openstack-dashboard makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages #[contrail-ostack-dashboard-deb] #pkgs = openstack-dashboard @@ -132,7 +131,6 @@ package_type = contrail-openstack-packages pkgs = python-neutronclient makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages [neutron-plugin-contrail-deb] pkgs = neutron-plugin-contrail @@ -156,13 +154,6 @@ pkgs = nova-api, nova-cells, nova-common, nova-compute, nova-scheduler, nova-compute-libvirt, python-nova makeloc = tools/packaging/openstack/debian builtloc = build/openstack -package_type = contrail-openstack-packages - -[contrail-installer-package] -pkgs = contrail-installer-package -makeloc = tools/packaging/common/debian -target = contrail-installer-package-deb -package_type = contrail-installer-package [contrail-install-packages] pkgs = contrail-install-packages @@ -173,36 +164,36 @@ package_type = contrail-install-packages [contrail-packages] pkgs = contrail-packages makeloc = tools/packaging/common/debian -package_type = contrail-packages, contrail-install-packages +package_type = contrail-packages [contrail-thirdparty-packages] pkgs = contrail-thirdparty-packages makeloc = tools/packaging/common/debian -package_type = contrail-thirdparty-packages, contrail-install-packages +package_type = contrail-thirdparty-packages [contrail-dependent-packages] pkgs = contrail-dependent-packages makeloc = tools/packaging/common/debian -package_type = contrail-dependent-packages, contrail-install-packages +package_type = contrail-dependent-packages [contrail-openstack-packages] pkgs = contrail-openstack-packages makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages, contrail-install-packages +package_type = contrail-openstack-packages [openstack-default-target] pkgs = makeloc = tools/packaging/openstack/debian target = all builtloc = build/openstack/ -package_type = contrail-openstack-packages +package_type = contrail-install-packages [contrail-default-target] pkgs = makeloc = tools/packaging/common/debian/ target = all builtloc = build/debian/ -package_type = contrail-packages +package_type = contrail-install-packages [contrail-openstack-ha-deb] pkgs = contrail-openstack-ha diff --git a/build/package_configs/ubuntu1204/icehouse/depends_packages.cfg b/build/package_configs/ubuntu1204/icehouse/depends_packages.cfg index e23e5cab0..984bd6b79 100644 --- a/build/package_configs/ubuntu1204/icehouse/depends_packages.cfg +++ b/build/package_configs/ubuntu1204/icehouse/depends_packages.cfg @@ -14,7 +14,7 @@ file = md5 = location = -package_type = contrail-dependent-packages +package_type = contrail-install-packages, contrail-dependent-packages [acl_2.2.51-5ubuntu1] file = acl_2.2.51-5ubuntu1_amd64.deb @@ -67,7 +67,6 @@ md5 = 77d0146994308804cbc5212d04f32055 [binutils_2.22-6ubuntu1.1] file = binutils_2.22-6ubuntu1.1_amd64.deb md5 = 4abcede722bd28bd70fe6f6016346bf1 -package_type = contrail-installer-package [bridge-utils_1.5-2ubuntu7] file = bridge-utils_1.5-2ubuntu7_amd64.deb @@ -136,7 +135,6 @@ md5 = 2af1b08b6fe69aa1fd6b7142cd403c27 [dpkg-dev_1.16.1.2ubuntu7.2] file = dpkg-dev_1.16.1.2ubuntu7.2_all.deb md5 = 0a47b68a9363e0214c56663d8c10e77d -package_type = contrail-installer-package [ebtables_2.0.9.2-2ubuntu2] file = ebtables_2.0.9.2-2ubuntu2_amd64.deb @@ -337,7 +335,7 @@ md5 = 55a6c3ca89e64dc2da86a3876f24a3ba [kafka_2.9.2-0.8.2.0] file = kafka_2.9.2-0.8.2.0-0contrail0_amd64.deb md5 = 0745dfaf82159b8c1625b82249320db4 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-consistent-hash_1.0] file = python-consistent-hash_1.0-0contrail1_amd64.deb @@ -530,7 +528,6 @@ md5 = ebd6f4fc5c880d17c9c61cdcfc971297 [libdpkg-perl_1.16.1.2ubuntu7.2] file = libdpkg-perl_1.16.1.2ubuntu7.2_all.deb md5 = bd2e01f09ab9ae26a85121b5ae83a5d9 -package_type = contrail-installer-package [libdw1_0.152-1ubuntu3] file = libdw1_0.152-1ubuntu3_amd64.deb @@ -623,12 +620,12 @@ md5 = 05ab08615f59642b06489a55dcbb03e0 [librdkafka1_0.8.5] file = librdkafka1_0.8.5-2-0contrail0_amd64.deb md5 = 65a5960a450ed56862f8535699077d30 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [librdkafka-dev_0.8.5] file = librdkafka-dev_0.8.5-2-0contrail0_amd64.deb md5 = 4c4324853279361e904927cdeb04da9a -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [liblapack3gf_3.3.1-1] file = liblapack3gf_3.3.1-1_amd64.deb @@ -873,7 +870,6 @@ md5 = 3ffd2bb6dfa0382b35482ea2a55e645d [libyaml-0-2_0.1.4-2ubuntu0.12.04.3] file = libyaml-0-2_0.1.4-2ubuntu0.12.04.3_amd64.deb md5 = 2a89d6f1fedd904ec0c025fc79ae7053 -package_type = contrail-installer-package [libzookeeper-java_3.4.5+dfsg-1] file = libzookeeper-java_3.4.5+dfsg-1_all.deb @@ -906,7 +902,6 @@ md5 = 3629b3235fce3f5081ef3951732a0a11 [make_3.81-8.1ubuntu1.1] file = make_3.81-8.1ubuntu1.1_amd64.deb md5 = 204a7b26f38f0377d0bf61940f3d524e -package_type = contrail-installer-package [makedumpfile_1.3.7-2] file = makedumpfile_1.3.7-2_amd64.deb @@ -963,7 +958,6 @@ md5 = 2a774767a48ddb5a5d5622cf620c074d [patch_2.6.1-3] file = patch_2.6.1-3_amd64.deb md5 = b5aada57a1902713e2bfa906636081b1 -package_type = contrail-installer-package [nova_docker] file = nova-docker_0.0.0.post116-0contrail0_all.deb @@ -1052,12 +1046,12 @@ md5 = bc87a1c7fef98de4218313fd9e508eac [python-backports.ssl-match-hostname_3.4.0.2-1contrail1] file = python-backports.ssl-match-hostname_3.4.0.2-1contrail1_all.deb md5 = 243c920a5c91d12801c525f3dcd2a6d1 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-bitarray_0.8.0-2contrail1] file = python-bitarray_0.8.0-2contrail1_amd64.deb md5 = 00e657063f69a9122b6eaff7bacd75c8 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-bottle_0.11.6-1] file = python-bottle_0.11.6-1_all.deb @@ -1070,7 +1064,7 @@ md5 = 6d0ef22047eed94e2d720e870f389625 [python-certifi_1.0.1-1contrail1] file = python-certifi_1.0.1-1contrail1_all.deb md5 = 46ab19b4096c653c10854f5c5e735f1c -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-cinder_2014.1.3-0ubuntu1~cloud0] file = python-cinder_2014.1.3-0ubuntu1~cloud0_all.deb @@ -1159,7 +1153,7 @@ md5 = ff971c30c90856c2efcf5ed17a0f4b53 [python-geventhttpclient_1.1.0-1contrail1] file = python-geventhttpclient_1.1.0-1contrail1_amd64.deb md5 = 1a00d30b23e355a014e90b75243f3227 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-glance_1:2014.1.2-0ubuntu1.1~cloud0] file = python-glance_1%%3a2014.1.2-0ubuntu1.1~cloud0_all.deb @@ -1228,12 +1222,12 @@ md5 = b0333cdecb70e0d97d74d6cfd98542c3 [python-kafka-python_0.9.2] file = python-kafka-python_0.9.2-0contrail0_all.deb md5 = ca72ef4061c3f6a6a1c4f3b3e1b3bc84 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-kazoo_1.3.1-1contrail2] file = python-kazoo_1.3.1-1contrail2_all.deb md5 = 1160ffdc6faa72bfb6f027f5e7b18bb1 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-keyring_0.9.2-0ubuntu0.12.04.2] file = python-keyring_0.9.2-0ubuntu0.12.04.2_all.deb @@ -1274,7 +1268,7 @@ md5 = d09be60be35f10ae9e03bfb87ac73c00 [python-lxml_3.3.1-1contrail1] file = python-lxml_3.3.1-1contrail1_amd64.deb md5 = 7c3cff6ae352621381d11bd43ab7e399 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-m2crypto_0.21.1-2ubuntu2] file = python-m2crypto_0.21.1-2ubuntu2_amd64.deb @@ -1319,7 +1313,7 @@ md5 = 04fbdb8cb3f386c413434c8eb434cbfc [python-ncclient_0.4.1-1contrail1] file = python-ncclient_0.4.1-1contrail1_all.deb md5 = fbf835d94c89850e07c5d4c64390691b -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-netaddr_0.7.7-1~cloud0] file = python-netaddr_0.7.7-1~cloud0_all.deb @@ -1416,12 +1410,10 @@ md5 = 747ed3ef4d258ea49df029e7aef6078b [python-pip_1.0-1build1] file = python-pip_1.0-1build1_all.deb md5 = 55dc8bbb9f99b65d1cb0230f3126ae79 -package_type = contrail-installer-package [python-pkg-resources_0.6.24-1ubuntu1] file = python-pkg-resources_0.6.24-1ubuntu1_all.deb md5 = 0e5af037ec2a08c4a992675f32d9f56e -package_type = contrail-installer-package [python-prettytable_0.7.2-2ubuntu2~cloud0] file = python-prettytable_0.7.2-2ubuntu2~cloud0_all.deb @@ -1446,7 +1438,7 @@ md5 = e4038f8858b66d069a2ce8c12964eb99 [python-pycassa_1.11.0-1contrail2] file = python-pycassa_1.11.0-1contrail2_all.deb md5 = 251c53af490a46086da56c9286b403e2 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-pycurl_7.19.0-4ubuntu3] file = python-pycurl_7.19.0-4ubuntu3_amd64.deb @@ -1463,7 +1455,7 @@ md5 = be32aa308d2123a1391ad7345af644d4 [python-redis_2.8.0-1contrail1] file = python-redis_2.8.0-1contrail1_all.deb md5 = a2c82a2b974ed10471570c09aef0673d -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-requests_2.2.1-1~cloud1] file = python-requests_2.2.1-1~cloud1_all.deb @@ -1480,7 +1472,6 @@ md5 = c4522ec41469152ca60f5183e386df11 [python-setuptools_0.6.24-1ubuntu1] file = python-setuptools_0.6.24-1ubuntu1_all.deb md5 = 3b89564b0ae0d40087686f1e464cfe21 -package_type = contrail-installer-package [python-simplejson_3.3.1-1ubuntu6~cloud0] file = python-simplejson_3.3.1-1ubuntu6~cloud0_amd64.deb @@ -1505,7 +1496,7 @@ md5 = ae15a3d6f75b87a2fc86bc64a4aa6859 [python-stevedore_0.14.1-1contrail4] file = python-stevedore_0.14.1-1contrail4_all.deb md5 = 31c931ee9a8c0e047d52f31b7e61254d -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-suds_0.4.1-2ubuntu1.1] file = python-suds_0.4.1-2ubuntu1.1_all.deb @@ -1562,12 +1553,11 @@ md5 = 2c9692e0811ca926a91256bf627acb5b [python-xmltodict_0.9.0-1contrail1] file = python-xmltodict_0.9.0-1contrail1_all.deb md5 = 49ad578daa539e8965bbcaaac9a8045e -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-yaml_3.10-2] file = python-yaml_3.10-2_amd64.deb md5 = 1a75f120b87c80c03bcdbe766cb23233 -package_type = contrail-installer-package [python-zope.interface_3.6.1-1ubuntu3] file = python-zope.interface_3.6.1-1ubuntu3_amd64.deb @@ -1772,7 +1762,7 @@ md5 = 45d9ef64554e436b29ffcf85c79e099c [nodejs] file = nodejs_0.8.15-1contrail1_amd64.deb md5 = 266a7423da197d044000d3e389dd5aff -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [supervisor] file = supervisor_3.0r1-1_all.deb diff --git a/build/package_configs/ubuntu1404/icehouse/contrail_packages.cfg b/build/package_configs/ubuntu1404/icehouse/contrail_packages.cfg index 3c9932fa3..28c3b4c60 100644 --- a/build/package_configs/ubuntu1404/icehouse/contrail_packages.cfg +++ b/build/package_configs/ubuntu1404/icehouse/contrail_packages.cfg @@ -21,7 +21,7 @@ pkg_pattern = {pkg}_[0-9]*.deb builtloc = build/debian/ target = %(__name__)s makeloc = -package_type = contrail-packages +package_type = contrail-install-packages, contrail-packages [contrail] pkgs = contrail-analytics, contrail-config, contrail-control, contrail-lib, @@ -72,42 +72,41 @@ makeloc = tools/packaging/common/debian [contrail-fabric-utils-deb] pkgs = contrail-fabric-utils makeloc = tools/packaging/common/debian -package_type = contrail-installer-package [contrail-openstack-deb] pkgs = contrail-openstack makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-analytics-deb] pkgs = contrail-openstack-analytics makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-config-deb] pkgs = contrail-openstack-config makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-control-deb] pkgs = contrail-openstack-control makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-database-deb] pkgs = contrail-openstack-database makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-vrouter-deb] pkgs = contrail-openstack-vrouter makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-webui-deb] pkgs = contrail-openstack-webui makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [ifmap-server] pkgs = ifmap-server @@ -122,7 +121,7 @@ builtloc = build/packages [contrail-openstack-dashboard-deb] pkgs = contrail-openstack-dashboard makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages #[contrail-ostack-dashboard-deb] #pkgs = openstack-dashboard @@ -132,7 +131,6 @@ package_type = contrail-openstack-packages pkgs = python-neutronclient makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages [neutron-plugin-contrail-deb] pkgs = neutron-plugin-contrail @@ -151,13 +149,6 @@ pkgs = nova-api, nova-cells, nova-common, nova-compute, nova-scheduler, nova-compute-libvirt, python-nova makeloc = tools/packaging/openstack/debian builtloc = build/openstack -package_type = contrail-openstack-packages - -[contrail-installer-package] -pkgs = contrail-installer-package -makeloc = tools/packaging/common/debian -target = contrail-installer-package-deb -package_type = contrail-installer-package [contrail-install-packages] pkgs = contrail-install-packages @@ -168,36 +159,36 @@ package_type = contrail-install-packages [contrail-packages] pkgs = contrail-packages makeloc = tools/packaging/common/debian -package_type = contrail-packages, contrail-install-packages +package_type = contrail-packages [contrail-thirdparty-packages] pkgs = contrail-thirdparty-packages makeloc = tools/packaging/common/debian -package_type = contrail-thirdparty-packages, contrail-install-packages +package_type = contrail-thirdparty-packages [contrail-dependent-packages] pkgs = contrail-dependent-packages makeloc = tools/packaging/common/debian -package_type = contrail-dependent-packages, contrail-install-packages +package_type = contrail-dependent-packages [contrail-openstack-packages] pkgs = contrail-openstack-packages makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages, contrail-install-packages +package_type = contrail-openstack-packages [openstack-default-target] pkgs = makeloc = tools/packaging/openstack/debian target = all builtloc = build/openstack/ -package_type = contrail-openstack-packages +package_type = contrail-install-packages [contrail-default-target] pkgs = makeloc = tools/packaging/common/debian/ target = all builtloc = build/debian/ -package_type = contrail-packages +package_type = contrail-install-packages [contrail-openstack-ha-deb] pkgs = contrail-openstack-ha diff --git a/build/package_configs/ubuntu1404/icehouse/depends_packages.cfg b/build/package_configs/ubuntu1404/icehouse/depends_packages.cfg index bfea755cb..295e5e2db 100644 --- a/build/package_configs/ubuntu1404/icehouse/depends_packages.cfg +++ b/build/package_configs/ubuntu1404/icehouse/depends_packages.cfg @@ -14,7 +14,7 @@ file = md5 = location = -package_type = contrail-dependent-packages +package_type = contrail-install-packages, contrail-dependent-packages [acl_2.2.52-1] file = acl_2.2.52-1_amd64.deb @@ -55,7 +55,6 @@ md5 = 970d73e2beae6852c8af26a9b3ae1794 [binutils_2.24-5ubuntu3] file = binutils_2.24-5ubuntu3_amd64.deb md5 = 129330d099cb8c8daaea4306ab324c7a -package_type = contrail-installer-package [biosdevname] file = biosdevname_0.4.1-0ubuntu6.1_amd64.deb @@ -132,7 +131,6 @@ md5 = 60bafb9b863671bb02595505a447270c [dpkg-dev_1.17.5ubuntu5.3] file = dpkg-dev_1.17.5ubuntu5.3_all.deb md5 = 84577946555ef68f3aa5ffdf27787fe9 -package_type = contrail-installer-package [ebtables_2.0.10.4-3ubuntu1] file = ebtables_2.0.10.4-3ubuntu1_amd64.deb @@ -365,7 +363,7 @@ md5 = 25ed60e830fa2fda6edcebc69a91c4ed [kafka_2.9.2-0.8.2.0] file = kafka_2.9.2-0.8.2.0-0contrail0_amd64.deb md5 = 0745dfaf82159b8c1625b82249320db4 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-consistent-hash_1.0] file = python-consistent-hash_1.0-0contrail1_amd64.deb @@ -538,7 +536,6 @@ md5 = 53c59ad9793bbd09d9c8dedcdecaba1c [libdpkg-perl_1.17.5ubuntu5.3] file = libdpkg-perl_1.17.5ubuntu5.3_all.deb md5 = 5ae7538ca92dc34b2001d35981cf5337 -package_type = contrail-installer-package [libdrm-intel1_2.4.52-1] file = libdrm-intel1_2.4.52-1_amd64.deb @@ -683,12 +680,12 @@ md5 = 305ad423ee8697a945c3610cf10a6bdf [librdkafka1_0.8.5] file = librdkafka1_0.8.5-2-0contrail0.14.04_amd64.deb md5 = 0f8a72ecdc35e176eae4429df102f903 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [librdkafka-dev_0.8.5] file = librdkafka-dev_0.8.5-2-0contrail0.14.04_amd64.deb md5 = b2b7f430a3638eb9c3a3a3cddfa8a664 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [liblapack3_3.5.0-2ubuntu1] file = liblapack3_3.5.0-2ubuntu1_amd64.deb @@ -1037,7 +1034,6 @@ md5 = d7241d878ea65cbed080196411ec92c2 [libyaml-0-2_0] file = libyaml-0-2_0.1.4-3ubuntu3_amd64.deb md5 = e2849c121adaac85bb1650d406d98a1b -package_type = contrail-installer-package [libzookeeper-java-doc_3.4.5+dfsg-1] file = libzookeeper-java-doc_3.4.5+dfsg-1_all.deb @@ -1110,7 +1106,6 @@ md5 = 923cad1a2af2d6b0a3e8fa909ba26ca4 [make_3.81-8.2ubuntu3] file = make_3.81-8.2ubuntu3_amd64.deb md5 = 6442fbef4450fc977fb1ab6297cf7797 -package_type = contrail-installer-package [makedumpfile_1.5.5-2ubuntu1.1] file = makedumpfile_1.5.5-2ubuntu1.1_amd64.deb @@ -1171,7 +1166,7 @@ md5 = 6cb2eed8af1914752eaf4f3799c4c779 [nodejs_0.8.15] file = nodejs_0.8.15-1contrail1_amd64.deb md5 = 266a7423da197d044000d3e389dd5aff -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [nova-docker] file = nova-docker_0.0.0.post116-0contrail0_all.deb @@ -1212,7 +1207,6 @@ md5 = baa583f9a6408a21a1b2a8918bf3860e [patch_2.7.1-4ubuntu1] file = patch_2.7.1-4ubuntu1_amd64.deb md5 = 228f3a132cc9e516dce93d3b54024135 -package_type = contrail-installer-package [percona-xtrabackup] file = percona-xtrabackup_2.1.8-1_amd64.deb @@ -1273,7 +1267,6 @@ md5 = 1532d286ecad16204509eca1e97b8c37 [python-yaml_3.10-4build4] file = python-yaml_3.10-4build4_amd64.deb md5 = e4763458ff10f98655c1c6637c1d14c0 -package_type = contrail-installer-package [python-zope.interface_4.0.5-1ubuntu4] file = python-zope.interface_4.0.5-1ubuntu4_amd64.deb @@ -1314,7 +1307,7 @@ md5 = af3cd914d55062d4e165dc7b1e536507 [python-backports.ssl-match-hostname_3.4.0.2-1contrail1] file = python-backports.ssl-match-hostname_3.4.0.2-1contrail1_all.deb md5 = 243c920a5c91d12801c525f3dcd2a6d1 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-bitarray_0.8.0-2build4] file = python-bitarray_0.8.0-2build4_amd64.deb @@ -1335,7 +1328,7 @@ md5 = 3b2691f75c2dac864d2114f5207a9fac [python-certifi_1.0.1-1contrail1] file = python-certifi_1.0.1-1contrail1_all.deb md5 = 46ab19b4096c653c10854f5c5e735f1c -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-cinder_2014.1.3-0ubuntu1] file = python-cinder_2014.1.3-0ubuntu1~cloud0_all.deb @@ -1364,7 +1357,6 @@ md5 = 9b2fea5232b418bee0ae8144aee42e6b [python-colorama_0.2.5-0.1ubuntu1] file = python-colorama_0.2.5-0.1ubuntu1_all.deb md5 = 2f10ef6c0fdbcf44a18046b5372c6e5c -package_type = contrail-installer-package [python-compressor_1.3-1ubuntu3] file = python-compressor_1.3-1ubuntu3_all.deb @@ -1385,7 +1377,6 @@ md5 = 14b3d2529bbf2ba7ea46553586ce24ed [python-distlib_0.1.8-1] file = python-distlib_0.1.8-1_all.deb md5 = c8ec1a686f1037fd9b06c2bbd5eb16fd -package_type = contrail-installer-package [python-django-horizon_1:2014.1.3-0ubuntu1] file = python-django-horizon_1%%3a2014.1.3-0ubuntu1_all.deb @@ -1434,7 +1425,7 @@ md5 = 7a0e277b556505bd5d663986ba8df167 [python-geventhttpclient_1.1.0-1contrail1] file = python-geventhttpclient_1.1.0-1contrail1_amd64.deb md5 = 1a00d30b23e355a014e90b75243f3227 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-glance_1:2014.1.3-0ubuntu1] file = python-glance_1%%3a2014.1.3-0ubuntu1_all.deb @@ -1459,7 +1450,6 @@ md5 = 211400536d827693652dcad106c97ff4 [python-html5lib_0.999-2] file = python-html5lib_0.999-2_all.deb md5 = 385953c57264e9e0b8a8ba30f727dae0 -package_type = contrail-installer-package [python-httplib2_0.8-2build1] file = python-httplib2_0.8-2build1_all.deb @@ -1496,12 +1486,12 @@ md5 = f24f78b639a2aed323e456bd8df4b099 [python-kafka-python_0.9.2] file = python-kafka-python_0.9.2-0contrail0_all.deb md5 = ca72ef4061c3f6a6a1c4f3b3e1b3bc84 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-kazoo_1.3.1-1contrail2] file = python-kazoo_1.3.1-1contrail2_all.deb md5 = 1160ffdc6faa72bfb6f027f5e7b18bb1 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-keystone_1:2014.1.3-0ubuntu2] file = python-keystone_1%%3a2014.1.3-0ubuntu2_all.deb @@ -1574,7 +1564,7 @@ md5 = f9afbad9900ea523db8e77a9b13e147b [python-ncclient_0.4.1-1contrail1] file = python-ncclient_0.4.1-1contrail1_all.deb md5 = fbf835d94c89850e07c5d4c64390691b -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-netaddr_0.7.10-1build1] file = python-netaddr_0.7.10-1build1_all.deb @@ -1667,12 +1657,10 @@ md5 = a289b28e339bf153a43a6b06933e192d [python-pip_1.5.4-1] file = python-pip_1.5.4-1_all.deb md5 = 8e1c420453fdf284e1ccc59adb219f97 -package_type = contrail-installer-package [python-pkg-resources_3.3-1ubuntu1] file = python-pkg-resources_3.3-1ubuntu1_all.deb md5 = 405401d8abf835f703bd6499a5f9788a -package_type = contrail-installer-package [python-psutil_1.2.1-1ubuntu2] file = python-psutil_1.2.1-1ubuntu2_amd64.deb @@ -1697,7 +1685,7 @@ md5 = 33831b0b33cd23bd2266f6f19dac2817 [python-pycassa_1.11.0-1contrail2] file = python-pycassa_1.11.0-1contrail2_all.deb md5 = 251c53af490a46086da56c9286b403e2 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-qpid_0.22+dfsg-1] file = python-qpid_0.22+dfsg-1_all.deb @@ -1706,7 +1694,7 @@ md5 = 647e9851d3fb2db8c92c4bcd98a11970 [python-redis_2.8.0-1contrail1] file = python-redis_2.8.0-1contrail1_all.deb md5 = a2c82a2b974ed10471570c09aef0673d -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-repoze.lru_0.6-4] file = python-repoze.lru_0.6-4_all.deb @@ -1727,7 +1715,6 @@ md5 = cf245a8f89a68cef75d45d943bcbe8e3 [python-setuptools_3.3-1ubuntu1] file = python-setuptools_3.3-1ubuntu1_all.deb md5 = 96cc818890d36f1eddc7be31009eaeb9 -package_type = contrail-installer-package [python-simplejson_3.3.1-1ubuntu6] file = python-simplejson_3.3.1-1ubuntu6_amd64.deb @@ -1796,7 +1783,7 @@ md5 = 703bfe383914afa08877b2a861b15508 [python-xmltodict_0.9.0-1contrail1] file = python-xmltodict_0.9.0-1contrail1_all.deb md5 = 49ad578daa539e8965bbcaaac9a8045e -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [qemu-keymaps_2.0.0+dfsg-2ubuntu1.6] file = qemu-keymaps_2.0.0+dfsg-2ubuntu1.6_all.deb diff --git a/build/package_configs/ubuntu1404/juno/contrail_packages.cfg b/build/package_configs/ubuntu1404/juno/contrail_packages.cfg index 9183a68a0..e6490a05e 100644 --- a/build/package_configs/ubuntu1404/juno/contrail_packages.cfg +++ b/build/package_configs/ubuntu1404/juno/contrail_packages.cfg @@ -21,7 +21,7 @@ pkg_pattern = {pkg}_[0-9]*.deb builtloc = build/debian/ target = %(__name__)s makeloc = -package_type = contrail-packages +package_type = contrail-install-packages, contrail-packages [contrail] pkgs = contrail-analytics, contrail-config, contrail-control, contrail-lib, @@ -73,42 +73,41 @@ makeloc = tools/packaging/common/debian [contrail-fabric-utils-deb] pkgs = contrail-fabric-utils makeloc = tools/packaging/common/debian -package_type = contrail-installer-package [contrail-openstack-deb] pkgs = contrail-openstack makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-analytics-deb] pkgs = contrail-openstack-analytics makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-config-deb] pkgs = contrail-openstack-config makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-control-deb] pkgs = contrail-openstack-control makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-database-deb] pkgs = contrail-openstack-database makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-vrouter-deb] pkgs = contrail-openstack-vrouter makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [contrail-openstack-webui-deb] pkgs = contrail-openstack-webui makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages +package_type = contrail-install-packages, contrail-openstack-packages [ifmap-server] pkgs = ifmap-server @@ -132,7 +131,6 @@ makeloc = tools/packaging/common/debian pkgs = python-neutronclient makeloc = tools/packaging/openstack/debian builtloc = build/openstack/ -package_type = contrail-openstack-packages [neutron-plugin-contrail-deb] pkgs = neutron-plugin-contrail @@ -151,13 +149,6 @@ pkgs = nova-api, nova-cells, nova-common, nova-compute, nova-scheduler, nova-compute-libvirt, python-nova makeloc = tools/packaging/openstack/debian builtloc = build/openstack -package_type = contrail-openstack-packages - -[contrail-installer-package] -pkgs = contrail-installer-package -makeloc = tools/packaging/common/debian -target = contrail-installer-package-deb -package_type = contrail-installer-package [contrail-install-packages] pkgs = contrail-install-packages @@ -168,36 +159,36 @@ package_type = contrail-install-packages [contrail-packages] pkgs = contrail-packages makeloc = tools/packaging/common/debian -package_type = contrail-packages, contrail-install-packages +package_type = contrail-packages [contrail-thirdparty-packages] pkgs = contrail-thirdparty-packages makeloc = tools/packaging/common/debian -package_type = contrail-thirdparty-packages, contrail-install-packages +package_type = contrail-thirdparty-packages [contrail-dependent-packages] pkgs = contrail-dependent-packages makeloc = tools/packaging/common/debian -package_type = contrail-dependent-packages, contrail-install-packages +package_type = contrail-dependent-packages [contrail-openstack-packages] pkgs = contrail-openstack-packages makeloc = tools/packaging/common/debian -package_type = contrail-openstack-packages, contrail-install-packages +package_type = contrail-openstack-packages [openstack-default-target] pkgs = makeloc = tools/packaging/openstack/debian target = all builtloc = build/openstack/ -package_type = contrail-openstack-packages +package_type = contrail-install-packages [contrail-default-target] pkgs = makeloc = tools/packaging/common/debian/ target = all builtloc = build/debian/ -package_type = contrail-packages +package_type = contrail-install-packages [contrail-openstack-ha-deb] pkgs = contrail-openstack-ha diff --git a/build/package_configs/ubuntu1404/juno/depends_packages.cfg b/build/package_configs/ubuntu1404/juno/depends_packages.cfg index 991df50d6..82763fc3e 100644 --- a/build/package_configs/ubuntu1404/juno/depends_packages.cfg +++ b/build/package_configs/ubuntu1404/juno/depends_packages.cfg @@ -14,7 +14,7 @@ file = md5 = location = -package_type = contrail-dependent-packages +package_type = contrail-install-packages, contrail-dependent-packages [acl_2.2.52-1] file = acl_2.2.52-1_amd64.deb @@ -51,7 +51,6 @@ md5 = 970d73e2beae6852c8af26a9b3ae1794 [binutils_2.24-5ubuntu3] file = binutils_2.24-5ubuntu3_amd64.deb md5 = 129330d099cb8c8daaea4306ab324c7a -package_type = contrail-installer-package [biosdevname] file = biosdevname_0.4.1-0ubuntu6.1_amd64.deb @@ -172,7 +171,6 @@ md5 = 78df317de3c8cbcdc76ec4c78d2d5921 [dpkg-dev_1.17.5ubuntu5.3] file = dpkg-dev_1.17.5ubuntu5.3_all.deb md5 = 84577946555ef68f3aa5ffdf27787fe9 -package_type = contrail-installer-package [ebtables_2.0.10.4-3ubuntu1] file = ebtables_2.0.10.4-3ubuntu1_amd64.deb @@ -417,12 +415,11 @@ md5 = 25ed60e830fa2fda6edcebc69a91c4ed [kafka_2.9.2-0.8.1.1-0contrail0.14.04] file = kafka_2.9.2-0.8.1.1-0contrail0.14.04_amd64.deb md5 = 55a28e092b71cfad9b98efcd5dc16a24 -package_type = contrail-thirdparty-packages [kafka_2.9.2-0.8.2.0] file = kafka_2.9.2-0.8.2.0-0contrail0_amd64.deb md5 = 0745dfaf82159b8c1625b82249320db4 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [kdump-tools_1.5.5-2ubuntu1] file = kdump-tools_1.5.5-2ubuntu1_all.deb @@ -607,7 +604,6 @@ md5 = 91bf0e8df2b2b596fcb118c719acba1f [libdpkg-perl_1.17.5ubuntu5.3] file = libdpkg-perl_1.17.5ubuntu5.3_all.deb md5 = 5ae7538ca92dc34b2001d35981cf5337 -package_type = contrail-installer-package [libdrm-intel1_2.4.52-1] file = libdrm-intel1_2.4.52-1_amd64.deb @@ -1012,12 +1008,12 @@ md5 = b97ab2e9c51b548e0db7952f55adafcb [librdkafka-dev_0.8.5-2-0contrail0.14.04] file = librdkafka-dev_0.8.5-2-0contrail0.14.04_amd64.deb md5 = b2b7f430a3638eb9c3a3a3cddfa8a664 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [librdkafka1_0.8.5-2-0contrail0.14.04] file = librdkafka1_0.8.5-2-0contrail0.14.04_amd64.deb md5 = 0f8a72ecdc35e176eae4429df102f903 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [libroken18-heimdal_1.6~git20131207+dfsg-1ubuntu1.1] file = libroken18-heimdal_1.6~git20131207+dfsg-1ubuntu1.1_amd64.deb @@ -1254,7 +1250,6 @@ md5 = d7241d878ea65cbed080196411ec92c2 [libyaml-0-2_0.1.4-3ubuntu3] file = libyaml-0-2_0.1.4-3ubuntu3_amd64.deb md5 = e2849c121adaac85bb1650d406d98a1b -package_type = contrail-installer-package [libzookeeper-java-doc_3.4.5+dfsg-1] file = libzookeeper-java-doc_3.4.5+dfsg-1_all.deb @@ -1331,7 +1326,6 @@ md5 = 923cad1a2af2d6b0a3e8fa909ba26ca4 [make_3.81-8.2ubuntu3] file = make_3.81-8.2ubuntu3_amd64.deb md5 = 6442fbef4450fc977fb1ab6297cf7797 -package_type = contrail-installer-package [makedumpfile_1.5.5-2ubuntu1] file = makedumpfile_1.5.5-2ubuntu1_amd64.deb @@ -1400,7 +1394,7 @@ md5 = 6cb2eed8af1914752eaf4f3799c4c779 [nodejs_0.8.15-1contrail1] file = nodejs_0.8.15-1contrail1_amd64.deb md5 = 266a7423da197d044000d3e389dd5aff -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [nova-docker] file = nova-docker_0.0.0.post145-0contrail0_all.deb @@ -1437,7 +1431,6 @@ md5 = 4870faa1d171164a556259507718e418 [patch_2.7.1-4ubuntu1] file = patch_2.7.1-4ubuntu1_amd64.deb md5 = 228f3a132cc9e516dce93d3b54024135 -package_type = contrail-installer-package [pep8_1.5.6-0ubuntu1~cloud0] file = pep8_1.5.6-0ubuntu1~cloud0_all.deb @@ -1514,7 +1507,7 @@ md5 = af3cd914d55062d4e165dc7b1e536507 [python-backports.ssl-match-hostname_3.4.0.2-1contrail1] file = python-backports.ssl-match-hostname_3.4.0.2-1contrail1_all.deb md5 = 243c920a5c91d12801c525f3dcd2a6d1 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-barbicanclient_2.2.1-1~cloud0] file = python-barbicanclient_2.2.1-1~cloud0_all.deb @@ -1523,7 +1516,7 @@ md5 = fca0948a2ed760090d6e0e8702124a4a [python-bitarray_0.8.0-2contrail1] file = python-bitarray_0.8.0-2contrail1_amd64.deb md5 = 00e657063f69a9122b6eaff7bacd75c8 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-boto_1:2.12.0] file = python-boto_2.12.0_amd64.deb @@ -1556,7 +1549,7 @@ md5 = caa7788a12651186c41c568695e968c4 [python-certifi_1.0.1-1contrail1] file = python-certifi_1.0.1-1contrail1_all.deb md5 = 46ab19b4096c653c10854f5c5e735f1c -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-cinder_1:2014.2.2-0ubuntu1~cloud0] file = python-cinder_2014.2.2-0ubuntu1~cloud0_all.deb @@ -1581,7 +1574,6 @@ md5 = 9b2fea5232b418bee0ae8144aee42e6b [python-colorama_0.2.5-0.1ubuntu1] file = python-colorama_0.2.5-0.1ubuntu1_all.deb md5 = 2f10ef6c0fdbcf44a18046b5372c6e5c -package_type = contrail-installer-package [python-compressor_1.3-1ubuntu3] file = python-compressor_1.3-1ubuntu3_all.deb @@ -1618,7 +1610,6 @@ md5 = 14b3d2529bbf2ba7ea46553586ce24ed [python-distlib_0.1.8-1] file = python-distlib_0.1.8-1_all.deb md5 = c8ec1a686f1037fd9b06c2bbd5eb16fd -package_type = contrail-installer-package [python-django-horizon_1:2014.2.2-0ubuntu1~cloud0] file = python-django-horizon_2014.2.2-0ubuntu1~cloud0_all.deb @@ -1691,7 +1682,7 @@ md5 = 7a0e277b556505bd5d663986ba8df167 [python-geventhttpclient_1.1.0-1contrail1] file = python-geventhttpclient_1.1.0-1contrail1_amd64.deb md5 = 1a00d30b23e355a014e90b75243f3227 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-glance-store_0.1.8-1ubuntu2~cloud0] file = python-glance-store_0.1.8-1ubuntu2~cloud0_all.deb @@ -1732,7 +1723,6 @@ md5 = 2a67f7aef04515fe733e29a43dc8e2e4 [python-html5lib_0.999-2] file = python-html5lib_0.999-2_all.deb md5 = 385953c57264e9e0b8a8ba30f727dae0 -package_type = contrail-installer-package [python-httplib2_0.8-2build1] file = python-httplib2_0.8-2build1_all.deb @@ -1785,12 +1775,12 @@ md5 = f24f78b639a2aed323e456bd8df4b099 [python-kafka-python_0.9.2] file = python-kafka-python_0.9.2-0contrail0_all.deb md5 = ca72ef4061c3f6a6a1c4f3b3e1b3bc84 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-kazoo_1.3.1-1contrail2] file = python-kazoo_1.3.1-1contrail2_all.deb md5 = 1160ffdc6faa72bfb6f027f5e7b18bb1 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-keystone_1:2014.2.2-0ubuntu1~cloud0] file = python-keystone_2014.2.2-0ubuntu1~cloud0_all.deb @@ -1839,7 +1829,7 @@ md5 = e3ad9b19e83e1473313b1fd6fb582b7e [python-lxml_3.3.1-1contrail1] file = python-lxml_3.3.1-1contrail1_amd64.deb md5 = 7c3cff6ae352621381d11bd43ab7e399 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-m2crypto_0.21.1-3ubuntu5] file = python-m2crypto_0.21.1-3ubuntu5_amd64.deb @@ -1888,7 +1878,7 @@ md5 = f9afbad9900ea523db8e77a9b13e147b [python-ncclient_0.4.1-1contrail1] file = python-ncclient_0.4.1-1contrail1_all.deb md5 = fbf835d94c89850e07c5d4c64390691b -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-netaddr_0.7.12-1~cloud0] file = python-netaddr_0.7.12-1~cloud0_all.deb @@ -2025,12 +2015,10 @@ md5 = ccdcf48f9807dd1124134f77dc31afe3 [python-pip_1.5.4-1] file = python-pip_1.5.4-1_all.deb md5 = 8e1c420453fdf284e1ccc59adb219f97 -package_type = contrail-installer-package [python-pkg-resources_3.3-1ubuntu1] file = python-pkg-resources_3.3-1ubuntu1_all.deb md5 = 405401d8abf835f703bd6499a5f9788a -package_type = contrail-installer-package [python-ply_3.4-3ubuntu2] file = python-ply_3.4-3ubuntu2_all.deb @@ -2063,7 +2051,7 @@ md5 = b3ebe7a140442c94a16af77bd6717b25 [python-pycassa_1.11.0-1contrail2] file = python-pycassa_1.11.0-1contrail2_all.deb md5 = 251c53af490a46086da56c9286b403e2 -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-pygments_1.6+dfsg-1ubuntu1] file = python-pygments_1.6+dfsg-1ubuntu1_all.deb @@ -2108,7 +2096,7 @@ md5 = 647e9851d3fb2db8c92c4bcd98a11970 [python-redis_2.8.0-1contrail1] file = python-redis_2.8.0-1contrail1_all.deb md5 = a2c82a2b974ed10471570c09aef0673d -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-repoze.lru_0.6-4] file = python-repoze.lru_0.6-4_all.deb @@ -2149,7 +2137,6 @@ md5 = 815adaf14f9c402d2d0507b1d99e7d71 [python-setuptools_3.3-1ubuntu1] file = python-setuptools_3.3-1ubuntu1_all.deb md5 = 96cc818890d36f1eddc7be31009eaeb9 -package_type = contrail-installer-package [python-simplegeneric_0.8.1-1] file = python-simplegeneric_0.8.1-1_all.deb @@ -2306,12 +2293,11 @@ md5 = 400b5bf513f6c7754e56fad1ec833b4b [python-xmltodict_0.9.0-1contrail1] file = python-xmltodict_0.9.0-1contrail1_all.deb md5 = 49ad578daa539e8965bbcaaac9a8045e -package_type = contrail-thirdparty-packages +package_type = contrail-install-packages, contrail-thirdparty-packages [python-yaml_3.10-4build4] file = python-yaml_3.10-4build4_amd64.deb md5 = e4763458ff10f98655c1c6637c1d14c0 -package_type = contrail-installer-package [python-zope.interface_4.0.5-1ubuntu4] file = python-zope.interface_4.0.5-1ubuntu4_amd64.deb @@ -2336,12 +2322,10 @@ md5 = 2135fc8d8d683b3c43b63811c40d8706 [python3-pycurl_7.19.3-0ubuntu3] file = python3-pycurl_7.19.3-0ubuntu3_amd64.deb md5 = 4a8692a3639a46f0c512f5d77f42ff16 -package_type = contrail-installer-package [python3-software-properties_0.92.37.1] file = python3-software-properties_0.92.37.1_all.deb md5 = 740fa7953ac678969c65ada20ef02540 -package_type = contrail-installer-package [qemu-keymaps_2.0.0+dfsg-2ubuntu1.10] file = qemu-keymaps_2.0.0+dfsg-2ubuntu1.10_all.deb @@ -2414,7 +2398,6 @@ md5 = 275282c46c804b85014f83eb482711a2 [software-properties-common_0.92.37.1] file = software-properties-common_0.92.37.1_all.deb md5 = fe8f145563281c05893c2c20f84daed9 -package_type = contrail-installer-package [sphinx-common_1.2.2+dfsg-1ubuntu1.1] file = sphinx-common_1.2.2+dfsg-1ubuntu1.1_all.deb @@ -2451,7 +2434,6 @@ md5 = 9ca597db01571c45b8263a858f2a712f [unattended-upgrades_0.82.1ubuntu2] file = unattended-upgrades_0.82.1ubuntu2_all.deb md5 = d8552e1c8778d8be451b12f49ceb1314 -package_type = contrail-installer-package [update-inetd_4.43] file = update-inetd_4.43_all.deb diff --git a/build/setup_ubuntu1404_installer_pkg.sh b/build/setup_ubuntu1404_installer_pkg.sh deleted file mode 100644 index d7aa1a361..000000000 --- a/build/setup_ubuntu1404_installer_pkg.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -# create shell scripts and put to bin -mkdir -p /opt/contrail/bin - -cd /opt/contrail/contrail_installer_package -DEBIAN_FRONTEND=noninteractive dpkg -i binutils_2.24-5ubuntu3_amd64.deb make_3.81-8.2ubuntu3_amd64.deb \ - libdpkg-perl_1.17.5ubuntu5.3_all.deb patch_2.7.1-4ubuntu1_amd64.deb \ - dpkg-dev_1.17.5ubuntu5.3_all.deb \ - libyaml-0-2_0.1.4-3ubuntu3_amd64.deb python-yaml_3.10-4build4_amd64.deb \ - python-colorama_0.2.5-0.1ubuntu1_all.deb python-distlib_0.1.8-1_all.deb python-html5lib_0.999-2_all.deb \ - python-pip_1.5.4-1_all.deb - - -CONTRAIL_FAB=`ls contrail-fabric-utils_*.deb` -DEBIAN_FRONTEND=noninteractive dpkg -i $CONTRAIL_FAB - -cd /etc/apt/ -# Allow unauthenticated pacakges to get installed. -# Do not over-write apt.conf. Instead just append what is necessary -# retaining other useful configurations such as http::proxy info. -apt_auth="APT::Get::AllowUnauthenticated \"true\";" -grep --quiet "$apt_auth" /etc/apt/apt.conf -if [ "$?" != "0" ]; then - echo "$apt_auth" >> /etc/apt/apt.conf -fi - -# install ecdsa and fabric -pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/ecdsa-0.10.tar.gz -pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/Fabric-1.7.0.tar.gz - -#disabled sun-java-jre and sun-java-bin prompt during installation, add oracle license acceptance in debconf -echo 'sun-java6-plugin shared/accepted-sun-dlj-v1-1 boolean true' | /usr/bin/debconf-set-selections -echo 'sun-java6-bin shared/accepted-sun-dlj-v1-1 boolean true' | /usr/bin/debconf-set-selections -echo 'sun-java6-jre shared/accepted-sun-dlj-v1-1 boolean true' | /usr/bin/debconf-set-selections -echo 'debconf shared/accepted-oracle-license-v1-1 select true' | sudo debconf-set-selections -echo 'debconf shared/accepted-oracle-license-v1-1 seen true' | sudo debconf-set-selections - -#sudo add-apt-repository -y cloud-archive:havana -#sudo add-apt-repository -y ppa:webupd8team/java -#sudo add-apt-repository -y ppa:nilarimogard/webupd8 -#echo "deb http://www.apache.org/dist/cassandra/debian 11x main" | sudo tee /etc/apt/sources.list.d/cassandra.list -#curl https://www.apache.org/dist/cassandra/KEYS | sudo apt-key add -#apt-get update diff --git a/build/setup_ubuntu1404_split_pkgs.sh b/build/setup_ubuntu1404_split_pkgs.sh index 1aba9d037..c44821a83 100644 --- a/build/setup_ubuntu1404_split_pkgs.sh +++ b/build/setup_ubuntu1404_split_pkgs.sh @@ -1,15 +1,28 @@ #!/bin/bash +# backup old directories in case of upgrade +if [ -d /opt/contrail/contrail_install_packages ]; then + mkdir -p /opt/contrail/contrail_install_packages_backup + mv /opt/contrail/contrail_install_packages/* /opt/contrail/contrail_install_packages_backup/ +fi + # create shell scripts and put to bin mkdir -p /opt/contrail/bin -cd /opt/contrail/contrail_install_packages -CONTRAIL_DEP_PKG=`ls contrail-dependent-packages_*.deb` -CONTRAIL_THIRDPARTY_PKG=`ls contrail-thirdparty-packages_*.deb` -CONTRAIL_OS_PKG=`ls contrail-openstack-packages_*.deb` -CONTRAIL_PKG=`ls contrail-packages_*.deb` - -DEBIAN_FRONTEND=noninteractive dpkg -i --force-overwrite $CONTRAIL_DEP_PKG $CONTRAIL_THIRDPARTY_PKG $CONTRAIL_OS_PKG $CONTRAIL_PKG +cd /opt/contrail/contrail_install_repo +DEBIAN_FRONTEND=noninteractive dpkg -i binutils_2.24-5ubuntu3_amd64.deb make_3.81-8.2ubuntu3_amd64.deb \ + libdpkg-perl_1.17.5ubuntu5.3_all.deb patch_2.7.1-4ubuntu1_amd64.deb \ + dpkg-dev_1.17.5ubuntu5.3_all.deb + +cd /etc/apt/ +# Allow unauthenticated pacakges to get installed. +# Do not over-write apt.conf. Instead just append what is necessary +# retaining other useful configurations such as http::proxy info. +apt_auth="APT::Get::AllowUnauthenticated \"true\";" +grep --quiet "$apt_auth" /etc/apt/apt.conf +if [ "$?" != "0" ]; then + echo "$apt_auth" >> /etc/apt/apt.conf +fi cd /opt/contrail/contrail_install_repo dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz @@ -24,6 +37,27 @@ DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticat DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install curl # install base packages and fabric utils +DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-pip DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-crypto DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-netaddr DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-paramiko +DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install contrail-fabric-utils +DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install contrail-setup + +# install ecdsa and fabric +pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/ecdsa-0.10.tar.gz +pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/Fabric-1.7.0.tar.gz + +#disabled sun-java-jre and sun-java-bin prompt during installation, add oracle license acceptance in debconf +echo 'sun-java6-plugin shared/accepted-sun-dlj-v1-1 boolean true' | /usr/bin/debconf-set-selections +echo 'sun-java6-bin shared/accepted-sun-dlj-v1-1 boolean true' | /usr/bin/debconf-set-selections +echo 'sun-java6-jre shared/accepted-sun-dlj-v1-1 boolean true' | /usr/bin/debconf-set-selections +echo 'debconf shared/accepted-oracle-license-v1-1 select true' | sudo debconf-set-selections +echo 'debconf shared/accepted-oracle-license-v1-1 seen true' | sudo debconf-set-selections + +#sudo add-apt-repository -y cloud-archive:havana +#sudo add-apt-repository -y ppa:webupd8team/java +#sudo add-apt-repository -y ppa:nilarimogard/webupd8 +#echo "deb http://www.apache.org/dist/cassandra/debian 11x main" | sudo tee /etc/apt/sources.list.d/cassandra.list +#curl https://www.apache.org/dist/cassandra/KEYS | sudo apt-key add +#apt-get update diff --git a/build/setup_ubuntu_installer_pkg.sh b/build/setup_ubuntu_installer_pkg.sh deleted file mode 100644 index 35fa8d14b..000000000 --- a/build/setup_ubuntu_installer_pkg.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# create shell scripts and put to bin -mkdir -p /opt/contrail/bin - -cd /opt/contrail/contrail_installer_package -DEBIAN_FRONTEND=noninteractive dpkg -i binutils_2.22-6ubuntu1.1_amd64.deb dpkg-dev_1.16.1.2ubuntu7.2_all.deb libdpkg-perl_1.16.1.2ubuntu7.2_all.deb make_3.81-8.1ubuntu1.1_amd64.deb patch_2.6.1-3_amd64.deb python-pip_1.0-1build1_all.deb python-pkg-resources_0.6.24-1ubuntu1_all.deb python-setuptools_0.6.24-1ubuntu1_all.deb libyaml-0-2_0.1.4-2ubuntu0.12.04.3_amd64.deb python-yaml_3.10-2_amd64.deb - -CONTRAIL_FAB=`ls contrail-fabric-utils_*.deb` -DEBIAN_FRONTEND=noninteractive dpkg -i $CONTRAIL_FAB - -cd /etc/apt/ -# Allow unauthenticated pacakges to get installed. -# Do not over-write apt.conf. Instead just append what is necessary -# retaining other useful configurations such as http::proxy info. -apt_auth="APT::Get::AllowUnauthenticated \"true\";" -grep --quiet "$apt_auth" apt.conf -if [ "$?" != "0" ]; then - echo "$apt_auth" >> apt.conf -fi - -# install ecdsa and fabric -pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/ecdsa-0.10.tar.gz -pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/Fabric-1.7.0.tar.gz - -#disabled sun-java-jre and sun-java-bin prompt during installation, add oracle license acceptance in debconf -echo 'sun-java6-plugin shared/accepted-sun-dlj-v1-1 boolean true' | /usr/bin/debconf-set-selections -echo 'sun-java6-bin shared/accepted-sun-dlj-v1-1 boolean true' | /usr/bin/debconf-set-selections -echo 'sun-java6-jre shared/accepted-sun-dlj-v1-1 boolean true' | /usr/bin/debconf-set-selections -echo 'debconf shared/accepted-oracle-license-v1-1 select true' | sudo debconf-set-selections -echo 'debconf shared/accepted-oracle-license-v1-1 seen true' | sudo debconf-set-selections - -#sudo add-apt-repository -y cloud-archive:havana -#sudo add-apt-repository -y ppa:webupd8team/java -#sudo add-apt-repository -y ppa:nilarimogard/webupd8 -#echo "deb http://www.apache.org/dist/cassandra/debian 11x main" | sudo tee /etc/apt/sources.list.d/cassandra.list -#curl https://www.apache.org/dist/cassandra/KEYS | sudo apt-key add -#apt-get update diff --git a/build/setup_ubuntu_juno_installer_pkg.sh b/build/setup_ubuntu_juno_installer_pkg.sh deleted file mode 100644 index 552e0865d..000000000 --- a/build/setup_ubuntu_juno_installer_pkg.sh +++ /dev/null @@ -1,42 +0,0 @@ -#! /bin/bash - -# create shell scripts and put to bin -mkdir -p /opt/contrail/bin - -cd /opt/contrail/contrail_installer_package -DEBIAN_FRONTEND=noninteractive dpkg -i binutils_2.24-5ubuntu3_amd64.deb make_3.81-8.2ubuntu3_amd64.deb libdpkg-perl_1.17.5ubuntu5.3_all.deb dpkg-dev_1.17.5ubuntu5.3_all.deb patch_2.7.1-4ubuntu1_amd64.deb - -#DEBIAN_FRONTEND=noninteractive dpkg -i binutils_2.22-6ubuntu1.1_amd64.deb dpkg-dev_1.16.1.2ubuntu7.2_all.deb libdpkg-perl_1.16.1.2ubuntu7.2_all.deb make_3.81-8.1ubuntu1.1_amd64.deb patch_2.6.1-3_amd64.deb python-pip_1.0-1build1_all.deb python-pkg-resources_0.6.24-1ubuntu1_all.deb python-setuptools_0.6.24-1ubuntu1_all.deb - -DEBIAN_FRONTEND=noninteractive dpkg -i python3-pycurl_7.19.3-0ubuntu3_amd64.deb python3-software-properties_0.92.37.1_all.deb software-properties-common_0.92.37.1_all.deb unattended-upgrades_0.82.1ubuntu2_all.deb python-colorama_0.2.5-0.1ubuntu1_all.deb python-distlib_0.1.8-1_all.deb python-html5lib_0.999-2_all.deb python-pkg-resources_3.3-1ubuntu1_all.deb python-setuptools_3.3-1ubuntu1_all.deb python-pip_1.5.4-1_all.deb - -CONTRAIL_FAB=`ls contrail-fabric-utils_*.deb` -DEBIAN_FRONTEND=noninteractive dpkg -i $CONTRAIL_FAB libyaml-0-2_0.1.4-3ubuntu3_amd64.deb python-yaml_3.10-4build4_amd64.deb - -cd /etc/apt/ -# Allow unauthenticated pacakges to get installed. -# Do not over-write apt.conf. Instead just append what is necessary -# retaining other useful configurations such as http::proxy info. -apt_auth="APT::Get::AllowUnauthenticated \"true\";" -grep --quiet "$apt_auth" apt.conf -if [ "$?" != "0" ]; then - echo "$apt_auth" >> apt.conf -fi - -# install ecdsa and fabric -pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/ecdsa-0.10.tar.gz -pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/Fabric-1.7.0.tar.gz - -#disabled sun-java-jre and sun-java-bin prompt during installation, add oracle license acceptance in debconf -echo 'sun-java6-plugin shared/accepted-sun-dlj-v1-1 boolean true' | /usr/bin/debconf-set-selections -echo 'sun-java6-bin shared/accepted-sun-dlj-v1-1 boolean true' | /usr/bin/debconf-set-selections -echo 'sun-java6-jre shared/accepted-sun-dlj-v1-1 boolean true' | /usr/bin/debconf-set-selections -echo 'debconf shared/accepted-oracle-license-v1-1 select true' | sudo debconf-set-selections -echo 'debconf shared/accepted-oracle-license-v1-1 seen true' | sudo debconf-set-selections - -#sudo add-apt-repository -y cloud-archive:havana -#sudo add-apt-repository -y ppa:webupd8team/java -#sudo add-apt-repository -y ppa:nilarimogard/webupd8 -#echo "deb http://www.apache.org/dist/cassandra/debian 11x main" | sudo tee /etc/apt/sources.list.d/cassandra.list -#curl https://www.apache.org/dist/cassandra/KEYS | sudo apt-key add -#apt-get update diff --git a/build/setup_ubuntu_juno_split_pkgs.sh b/build/setup_ubuntu_juno_split_pkgs.sh index f1dc718ba..89dac7b77 100644 --- a/build/setup_ubuntu_juno_split_pkgs.sh +++ b/build/setup_ubuntu_juno_split_pkgs.sh @@ -1,15 +1,30 @@ -#!/bin/bash +#! /bin/bash + +# backup old directories in case of upgrade +if [ -d /opt/contrail/contrail_install_packages ]; then + mkdir -p /opt/contrail/contrail_install_packages_backup + mv /opt/contrail/contrail_install_packages/* /opt/contrail/contrail_install_packages_backup/ +fi # create shell scripts and put to bin mkdir -p /opt/contrail/bin -cd /opt/contrail/contrail_install_packages -CONTRAIL_DEP_PKG=`ls contrail-dependent-packages_*.deb` -CONTRAIL_THIRDPARTY_PKG=`ls contrail-thirdparty-packages_*.deb` -CONTRAIL_OS_PKG=`ls contrail-openstack-packages_*.deb` -CONTRAIL_PKG=`ls contrail-packages_*.deb` +cd /opt/contrail/contrail_install_repo +DEBIAN_FRONTEND=noninteractive dpkg -i binutils_2.24-5ubuntu3_amd64.deb make_3.81-8.2ubuntu3_amd64.deb libdpkg-perl_1.17.5ubuntu5.3_all.deb dpkg-dev_1.17.5ubuntu5.3_all.deb patch_2.7.1-4ubuntu1_amd64.deb + +#DEBIAN_FRONTEND=noninteractive dpkg -i binutils_2.22-6ubuntu1.1_amd64.deb dpkg-dev_1.16.1.2ubuntu7.2_all.deb libdpkg-perl_1.16.1.2ubuntu7.2_all.deb make_3.81-8.1ubuntu1.1_amd64.deb patch_2.6.1-3_amd64.deb python-pip_1.0-1build1_all.deb python-pkg-resources_0.6.24-1ubuntu1_all.deb python-setuptools_0.6.24-1ubuntu1_all.deb + +DEBIAN_FRONTEND=noninteractive dpkg -i python3-pycurl_7.19.3-0ubuntu3_amd64.deb python3-software-properties_0.92.37.1_all.deb software-properties-common_0.92.37.1_all.deb unattended-upgrades_0.82.1ubuntu2_all.deb -DEBIAN_FRONTEND=noninteractive dpkg -i --force-overwrite $CONTRAIL_DEP_PKG $CONTRAIL_THIRDPARTY_PKG $CONTRAIL_OS_PKG $CONTRAIL_PKG +cd /etc/apt/ +# Allow unauthenticated pacakges to get installed. +# Do not over-write apt.conf. Instead just append what is necessary +# retaining other useful configurations such as http::proxy info. +apt_auth="APT::Get::AllowUnauthenticated \"true\";" +grep --quiet "$apt_auth" apt.conf +if [ "$?" != "0" ]; then + echo "$apt_auth" >> apt.conf +fi cd /opt/contrail/contrail_install_repo dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz @@ -20,9 +35,32 @@ dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz apt-get update #install primitive python packages and curl +DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install python-pip +DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install python-pkg-resources +DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install python-setuptools DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install curl # install base packages and fabric utils DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-crypto DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-netaddr DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-paramiko +DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install contrail-fabric-utils +DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install contrail-setup + +# install ecdsa and fabric +pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/ecdsa-0.10.tar.gz +pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/Fabric-1.7.0.tar.gz + +#disabled sun-java-jre and sun-java-bin prompt during installation, add oracle license acceptance in debconf +echo 'sun-java6-plugin shared/accepted-sun-dlj-v1-1 boolean true' | /usr/bin/debconf-set-selections +echo 'sun-java6-bin shared/accepted-sun-dlj-v1-1 boolean true' | /usr/bin/debconf-set-selections +echo 'sun-java6-jre shared/accepted-sun-dlj-v1-1 boolean true' | /usr/bin/debconf-set-selections +echo 'debconf shared/accepted-oracle-license-v1-1 select true' | sudo debconf-set-selections +echo 'debconf shared/accepted-oracle-license-v1-1 seen true' | sudo debconf-set-selections + +#sudo add-apt-repository -y cloud-archive:havana +#sudo add-apt-repository -y ppa:webupd8team/java +#sudo add-apt-repository -y ppa:nilarimogard/webupd8 +#echo "deb http://www.apache.org/dist/cassandra/debian 11x main" | sudo tee /etc/apt/sources.list.d/cassandra.list +#curl https://www.apache.org/dist/cassandra/KEYS | sudo apt-key add +#apt-get update diff --git a/build/setup_ubuntu_split_pkgs.sh b/build/setup_ubuntu_split_pkgs.sh index 8f29881a0..1283c5d19 100644 --- a/build/setup_ubuntu_split_pkgs.sh +++ b/build/setup_ubuntu_split_pkgs.sh @@ -1,15 +1,26 @@ #!/bin/bash +# backup old directories in case of upgrade +if [ -d /opt/contrail/contrail_install_packages ]; then + mkdir -p /opt/contrail/contrail_install_packages_backup + mv /opt/contrail/contrail_install_packages/* /opt/contrail/contrail_install_packages_backup/ +fi + # create shell scripts and put to bin mkdir -p /opt/contrail/bin -cd /opt/contrail/contrail_install_packages -CONTRAIL_DEP_PKG=`ls contrail-dependent-packages_*.deb` -CONTRAIL_THIRDPARTY_PKG=`ls contrail-thirdparty-packages_*.deb` -CONTRAIL_OS_PKG=`ls contrail-openstack-packages_*.deb` -CONTRAIL_PKG=`ls contrail-packages_*.deb` - -DEBIAN_FRONTEND=noninteractive dpkg -i --force-overwrite $CONTRAIL_DEP_PKG $CONTRAIL_THIRDPARTY_PKG $CONTRAIL_OS_PKG $CONTRAIL_PKG +cd /opt/contrail/contrail_dependents_repo +DEBIAN_FRONTEND=noninteractive dpkg -i binutils_2.22-6ubuntu1.1_amd64.deb dpkg-dev_1.16.1.2ubuntu7.2_all.deb libdpkg-perl_1.16.1.2ubuntu7.2_all.deb make_3.81-8.1ubuntu1.1_amd64.deb patch_2.6.1-3_amd64.deb python-pip_1.0-1build1_all.deb python-pkg-resources_0.6.24-1ubuntu1_all.deb python-setuptools_0.6.24-1ubuntu1_all.deb + +cd /etc/apt/ +# Allow unauthenticated pacakges to get installed. +# Do not over-write apt.conf. Instead just append what is necessary +# retaining other useful configurations such as http::proxy info. +apt_auth="APT::Get::AllowUnauthenticated \"true\";" +grep --quiet "$apt_auth" apt.conf +if [ "$?" != "0" ]; then + echo "$apt_auth" >> apt.conf +fi cd /opt/contrail/contrail_install_repo dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz @@ -23,7 +34,27 @@ apt-get update DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install python-software-properties DEBIAN_FRONTEND=noninteractive sudo apt-get -y --force-yes --allow-unauthenticated install curl -# install base packages +# install base packages and fabric utils DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-crypto DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-netaddr DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install python-paramiko +DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install contrail-fabric-utils +DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --allow-unauthenticated install contrail-setup + +# install ecdsa and fabric +pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/ecdsa-0.10.tar.gz +pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/Fabric-1.7.0.tar.gz + +#disabled sun-java-jre and sun-java-bin prompt during installation, add oracle license acceptance in debconf +echo 'sun-java6-plugin shared/accepted-sun-dlj-v1-1 boolean true' | /usr/bin/debconf-set-selections +echo 'sun-java6-bin shared/accepted-sun-dlj-v1-1 boolean true' | /usr/bin/debconf-set-selections +echo 'sun-java6-jre shared/accepted-sun-dlj-v1-1 boolean true' | /usr/bin/debconf-set-selections +echo 'debconf shared/accepted-oracle-license-v1-1 select true' | sudo debconf-set-selections +echo 'debconf shared/accepted-oracle-license-v1-1 seen true' | sudo debconf-set-selections + +#sudo add-apt-repository -y cloud-archive:havana +#sudo add-apt-repository -y ppa:webupd8team/java +#sudo add-apt-repository -y ppa:nilarimogard/webupd8 +#echo "deb http://www.apache.org/dist/cassandra/debian 11x main" | sudo tee /etc/apt/sources.list.d/cassandra.list +#curl https://www.apache.org/dist/cassandra/KEYS | sudo apt-key add +#apt-get update diff --git a/common/debian/Makefile b/common/debian/Makefile index f7f1bfe0c..dbabe02a0 100644 --- a/common/debian/Makefile +++ b/common/debian/Makefile @@ -159,16 +159,6 @@ ifmap-server: package-ifmap-server ifmap-python-client: package-ifmap-python-client @echo "Package ifmap-python client done" -contrail-installer-package: contrail-installer-package-deb -contrail-installer-package-deb: - $(eval BUILDDIR=${SB_TOP}/build/debian/contrail-installer-package) - mkdir -p ${BUILDDIR} - cp -ar ${SB_TOP}/tools/packaging/common/debian/contrail-installer-package/debian ${BUILDDIR} - (cd ${BUILDDIR}; fakeroot debian/rules clean) - (cd ${BUILDDIR}; fakeroot debian/rules binary) - @echo "Wrote: ${BUILDDIR}/../contrail-installer-package_$(VERSION)~$(CONTRAIL_SKU)_all.deb" - -contrail-install-packages: contrail-install-packages-deb contrail-install-packages-deb: $(eval BUILDDIR=${SB_TOP}/build/debian/contrail-install-packages) mkdir -p ${BUILDDIR} diff --git a/common/debian/contrail-dependent-packages/debian/contrail-dependent-packages.postrm b/common/debian/contrail-dependent-packages/debian/contrail-dependent-packages.postrm index cdd7efcc7..3ce0a6c72 100644 --- a/common/debian/contrail-dependent-packages/debian/contrail-dependent-packages.postrm +++ b/common/debian/contrail-dependent-packages/debian/contrail-dependent-packages.postrm @@ -4,9 +4,7 @@ line_num=`cat /etc/apt/sources.list | grep -n contrail_dependents_repo | cut -d sed -i 's%deb file\:\/opt\/contrail\/contrail_dependents_repo \.\/%%' /etc/apt/sources.list sed -i ''$line_num'{/^$/d}' /etc/apt/sources.list -if [ -d /opt/contrail/contrail_dependents_repo ]; then - cd /opt/contrail/contrail_dependents_repo - dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz -fi +cd /opt/contrail/contrail_dependents_repo +dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz echo "You may need to run \"apt-get update\" after de-installing the package..." diff --git a/common/debian/contrail-fabric-utils/debian/rules b/common/debian/contrail-fabric-utils/debian/rules index f1efc7a4f..e50ceb5d8 100755 --- a/common/debian/contrail-fabric-utils/debian/rules +++ b/common/debian/contrail-fabric-utils/debian/rules @@ -46,10 +46,6 @@ override_dh_auto_install: install -d -m 755 $(installroot)$(_contrailopt) install -d -m 755 $(installroot)$(_contrailopt)/utils install -d -m 755 $(installroot)$(_contrailopt)/utils/fabfile - install -d -m 755 $(installroot)$(_contrailopt)/python_packages - install -p -m 644 $(SB_TOP)/distro/third_party/ecdsa-0.10.tar.gz $(installroot)$(_contrailopt)/python_packages/ecdsa-0.10.tar.gz - install -p -m 644 $(SB_TOP)/distro/third_party/Fabric-1.7.0.tar.gz $(installroot)$(_contrailopt)/python_packages/Fabric-1.7.0.tar.gz - cd ${BUILDDIR}; python setup.py sdist tar zxf dist/contrail_fabric_utils-0.1dev.tar.gz cd contrail_fabric_utils-0.1dev; python setup.py install --root=$(installroot) diff --git a/common/debian/contrail-install-packages/debian/changelog b/common/debian/contrail-install-packages/debian/changelog new file mode 100755 index 000000000..f37462525 --- /dev/null +++ b/common/debian/contrail-install-packages/debian/changelog @@ -0,0 +1,6 @@ +contrail-install-packages (1402040750) amoghe; urgency=low + + [amoghe ] + * debian/changelog: changelog + + -- amoghe Mon, 11 Nov 2013 8:00:11 +0800 diff --git a/common/debian/contrail-install-packages/debian/changelog.in b/common/debian/contrail-install-packages/debian/changelog.in index 69eac4d67..5c0fce5a6 100755 --- a/common/debian/contrail-install-packages/debian/changelog.in +++ b/common/debian/contrail-install-packages/debian/changelog.in @@ -1,6 +1,6 @@ -contrail-install-packages (BUILDTAG) vmahuli; urgency=low +contrail-install-packages (BUILDTAG) amoghe; urgency=low - [vmahuli ] + [amoghe ] * debian/changelog: changelog - -- vmahuli Mon, 11 Nov 2013 8:00:11 +0800 + -- amoghe Mon, 11 Nov 2013 8:00:11 +0800 diff --git a/common/debian/contrail-install-packages/debian/control b/common/debian/contrail-install-packages/debian/control index a2f9131f9..b886b02da 100755 --- a/common/debian/contrail-install-packages/debian/control +++ b/common/debian/contrail-install-packages/debian/control @@ -1,5 +1,5 @@ Source: contrail-install-packages -Maintainer: vmahuli +Maintainer: amoghe Section: misc Priority: optional Standards-Version: 1.0 @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 8) Package: contrail-install-packages Architecture: all -Maintainer: vmahuli +Maintainer: amoghe Depends: Replaces: contrail-setup Section: contrail-install-packages diff --git a/common/debian/contrail-install-packages/debian/copyright b/common/debian/contrail-install-packages/debian/copyright index 6d66cbce7..c7a722bbd 100755 --- a/common/debian/contrail-install-packages/debian/copyright +++ b/common/debian/contrail-install-packages/debian/copyright @@ -1,5 +1,5 @@ Name: contrail-install-packages -Maintainer: vmahuli +Maintainer: amoghe License: Commercial Files: * Copyright (c) 2013 Juniper Networks, Inc. All rights reserved. diff --git a/common/debian/contrail-install-packages/debian/rules b/common/debian/contrail-install-packages/debian/rules index f3a4f2109..3bb482f9a 100755 --- a/common/debian/contrail-install-packages/debian/rules +++ b/common/debian/contrail-install-packages/debian/rules @@ -31,15 +31,15 @@ endif ifeq ($(DISTRIB_RELEASE),14.04) -SETUP_FILE := $(SB_TOP)/tools/packaging/build/setup_ubuntu1404_split_pkgs.sh +SETUP_FILE := $(SB_TOP)/tools/packaging/build/setup_ubuntu1404.sh endif ifeq ($(CONTRAIL_SKU),juno) -SETUP_FILE := $(SB_TOP)/tools/packaging/build/setup_ubuntu_juno_split_pkgs.sh +SETUP_FILE := $(SB_TOP)/tools/packaging/build/setup_ubuntu_juno.sh endif ifndef SETUP_FILE -SETUP_FILE := $(SB_TOP)/tools/packaging/build/setup_ubuntu_split_pkgs.sh +SETUP_FILE := $(SB_TOP)/tools/packaging/build/setup_ubuntu.sh endif %: @@ -56,20 +56,19 @@ override_dh_auto_install: @echo "making deb for contrail-install-packages" install -d -m 755 $(buildroot) install -d -m 755 $(buildroot)$(_contrailopt) - #install -d -m 755 $(buildroot)$(_contrailopt)/puppet - install -d -m 755 $(buildroot)$(_contrailopt)/contrail_install_packages + install -d -m 755 $(buildroot)$(_contrailopt)/puppet + install -d -m 755 $(buildroot)$(_contrailopt)/contrail_packages # Install files echo BUILDID=`echo $(BUILDTAG) | cut -d '-' -f2 | cut -d '~' -f1` > $(SB_TOP)/tools/packaging/build/VERSION_ubuntu; fi - install -p -m 755 $(SB_TOP)/tools/packaging/build/VERSION_ubuntu $(buildroot)$(_contrailopt)/contrail_install_packages/VERSION - install -p -m 755 $(SETUP_FILE) $(buildroot)$(_contrailopt)/contrail_install_packages/setup.sh - install -p -m 755 $(SB_TOP)/tools/packaging/build/sources.list $(buildroot)$(_contrailopt)/contrail_install_packages/sources.list - install -p -m 755 $(SB_TOP)/tools/packaging/build/repo_preferences $(buildroot)$(_contrailopt)/contrail_install_packages/preferences + install -p -m 755 $(SB_TOP)/tools/packaging/build/VERSION_ubuntu $(buildroot)$(_contrailopt)/contrail_packages/VERSION + install -p -m 755 $(SETUP_FILE) $(buildroot)$(_contrailopt)/contrail_packages/setup.sh + install -p -m 755 $(SB_TOP)/tools/packaging/build/sources.list $(buildroot)$(_contrailopt)/contrail_packages/sources.list + install -p -m 755 $(SB_TOP)/tools/packaging/build/repo_preferences $(buildroot)$(_contrailopt)/contrail_packages/preferences # install puppet manifests - #tar -cvzf $(SB_TOP)/build/contrail-puppet-manifest.tgz -C $(SB_TOP)/tools/puppet . - #install -p -m 755 $(SB_TOP)/build/contrail-puppet-manifest.tgz $(buildroot)$(_contrailopt)/puppet/contrail-puppet-manifest.tgz + tar -cvzf $(SB_TOP)/build/contrail-puppet-manifest.tgz -C $(SB_TOP)/tools/puppet . + install -p -m 755 $(SB_TOP)/build/contrail-puppet-manifest.tgz $(buildroot)$(_contrailopt)/puppet/contrail-puppet-manifest.tgz # install TGZ file and packages list file - # if [ -f $(TGZ_FILE) ]; then echo "Using TGZ FILE = $(TGZ_FILE)"; install -p -m 644 $(TGZ_FILE) $(buildroot)$(_contrailopt)/contrail_install_packages/contrail_debs.tgz; else echo "ERROR: TGZ file containing all debs is not supplied or not present"; echo "Supply Argument: FILE_LIST="; exit 1; fi - if [ -f $(TGZ_FILE) ]; then echo "Using TGZ FILE = $(TGZ_FILE)"; tar xzf $(TGZ_FILE) -C ${buildroot}${_contrailopt}/contrail_install_packages/ 2>/dev/null; else echo "ERROR: TGZ file containing all rpms is not supplied or not present"; echo "Supply Argument: FILE_LIST="; exit 1; fi + if [ -f $(TGZ_FILE) ]; then echo "Using TGZ FILE = $(TGZ_FILE)"; install -p -m 644 $(TGZ_FILE) $(buildroot)$(_contrailopt)/contrail_packages/contrail_debs.tgz; else echo "ERROR: TGZ file containing all debs is not supplied or not present"; echo "Supply Argument: FILE_LIST="; exit 1; fi override_dh_shlibdeps: diff --git a/common/debian/contrail-installer-package/debian/changelog.in b/common/debian/contrail-installer-package/debian/changelog.in deleted file mode 100755 index b821c632b..000000000 --- a/common/debian/contrail-installer-package/debian/changelog.in +++ /dev/null @@ -1,6 +0,0 @@ -contrail-installer-package (BUILDTAG) vmahuli; urgency=low - - [vmahuli ] - * debian/changelog: changelog - - -- vmahuli Mon, 11 Nov 2013 8:00:11 +0800 diff --git a/common/debian/contrail-installer-package/debian/compat b/common/debian/contrail-installer-package/debian/compat deleted file mode 100755 index 45a4fb75d..000000000 --- a/common/debian/contrail-installer-package/debian/compat +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/common/debian/contrail-installer-package/debian/control b/common/debian/contrail-installer-package/debian/control deleted file mode 100755 index 8b64bf95c..000000000 --- a/common/debian/contrail-installer-package/debian/control +++ /dev/null @@ -1,15 +0,0 @@ -Source: contrail-installer-package -Maintainer: vmahuli -Section: misc -Priority: optional -Standards-Version: 1.0 -Build-Depends: debhelper (>= 8) - -Package: contrail-installer-package -Architecture: all -Maintainer: vmahuli -Depends: -Replaces: contrail-setup -Section: contrail-installer-package -Priority: extra -Description: Contrail Installer Packages - Container of debian packages diff --git a/common/debian/contrail-installer-package/debian/copyright b/common/debian/contrail-installer-package/debian/copyright deleted file mode 100755 index 6d66cbce7..000000000 --- a/common/debian/contrail-installer-package/debian/copyright +++ /dev/null @@ -1,5 +0,0 @@ -Name: contrail-install-packages -Maintainer: vmahuli -License: Commercial -Files: * - Copyright (c) 2013 Juniper Networks, Inc. All rights reserved. diff --git a/common/debian/contrail-installer-package/debian/rules b/common/debian/contrail-installer-package/debian/rules deleted file mode 100755 index b997f1c67..000000000 --- a/common/debian/contrail-installer-package/debian/rules +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 -SPEC_DIR := $(shell pwd) -export SB_TOP := $(shell pwd | sed -re "s/\/build\/debian\/contrail-installer-package//g") -export DISTRIB_RELEASE = $(shell grep -Po "DISTRIB_RELEASE=\K.*" /etc/lsb-release) - -export BUILDTIME := $(shell date -u +%y%m%d%H%M) -export buildroot := $(SB_TOP)/build/debian/contrail-installer-package/debian/contrail-installer-package -export _contrailopt := /opt/contrail - -SRC_VER := $(shell cat $(SB_TOP)/controller/src/base/version.info) - -BUILDTAG = -TGZ_FILE = -ifdef TAG -BUILDTAG = $(SRC_VER)-$(TAG)~$(CONTRAIL_SKU) -else -BUILDTAG = $(SRC_VER)-$(BUILDTIME)~$(CONTRAIL_SKU) -endif - -ifdef FILE_LIST -TGZ_FILE = $(FILE_LIST) -endif - - -ifeq ($(DISTRIB_RELEASE),14.04) -SETUP_FILE := $(SB_TOP)/tools/packaging/build/setup_ubuntu1404_installer_pkg.sh -endif - -ifeq ($(CONTRAIL_SKU),juno) -SETUP_FILE := $(SB_TOP)/tools/packaging/build/setup_ubuntu_juno_installer_pkg.sh -endif - -ifndef SETUP_FILE -SETUP_FILE := $(SB_TOP)/tools/packaging/build/setup_ubuntu_installer_pkg.sh -endif - -%: - dh $@ - -override_dh_auto_build: - cat debian/changelog.in | sed 's,BUILDTAG,$(BUILDTAG),g' > debian/changelog - -override_dh_builddeb: - dh_builddeb -- -Zgzip - -override_dh_auto_install: - # Setup directories - @echo "making deb for contrail-installer-package" - install -d -m 755 $(buildroot) - install -d -m 755 $(buildroot)$(_contrailopt) - #install -d -m 755 $(buildroot)$(_contrailopt)/puppet - install -d -m 755 $(buildroot)$(_contrailopt)/contrail_installer_package - # Install files - echo BUILDID=`echo $(BUILDTAG) | cut -d '-' -f2 | cut -d '~' -f1` > $(SB_TOP)/tools/packaging/build/VERSION_ubuntu; fi - install -p -m 755 $(SB_TOP)/tools/packaging/build/VERSION_ubuntu $(buildroot)$(_contrailopt)/contrail_installer_package/VERSION - install -p -m 755 $(SETUP_FILE) $(buildroot)$(_contrailopt)/contrail_installer_package/setup.sh - install -p -m 755 $(SB_TOP)/tools/packaging/build/sources.list $(buildroot)$(_contrailopt)/contrail_installer_package/sources.list - install -p -m 755 $(SB_TOP)/tools/packaging/build/repo_preferences $(buildroot)$(_contrailopt)/contrail_installer_package/preferences - # install puppet manifests - #tar -cvzf $(SB_TOP)/build/contrail-puppet-manifest.tgz -C $(SB_TOP)/tools/puppet . - #install -p -m 755 $(SB_TOP)/build/contrail-puppet-manifest.tgz $(buildroot)$(_contrailopt)/puppet/contrail-puppet-manifest.tgz - # install TGZ file and packages list file - # if [ -f $(TGZ_FILE) ]; then echo "Using TGZ FILE = $(TGZ_FILE)"; install -p -m 644 $(TGZ_FILE) $(buildroot)$(_contrailopt)/contrail_install_packages/contrail_debs.tgz; else echo "ERROR: TGZ file containing all debs is not supplied or not present"; echo "Supply Argument: FILE_LIST="; exit 1; fi - if [ -f $(TGZ_FILE) ]; then echo "Using TGZ FILE = $(TGZ_FILE)"; tar xzf $(TGZ_FILE) -C ${buildroot}${_contrailopt}/contrail_installer_package/ 2>/dev/null; else echo "ERROR: TGZ file containing all rpms is not supplied or not present"; echo "Supply Argument: FILE_LIST="; exit 1; fi - -override_dh_shlibdeps: - -override_dh_usrlocal: - diff --git a/common/debian/contrail-openstack-packages/debian/contrail-openstack-packages.postrm b/common/debian/contrail-openstack-packages/debian/contrail-openstack-packages.postrm index fb52d375e..76b8cfc1a 100644 --- a/common/debian/contrail-openstack-packages/debian/contrail-openstack-packages.postrm +++ b/common/debian/contrail-openstack-packages/debian/contrail-openstack-packages.postrm @@ -6,9 +6,7 @@ if [ ! -f /opt/contrail/.contrail_packages ]; then sed -i ''$line_num'{/^$/d}' /etc/apt/sources.list fi -if [ -d /opt/contrail/contrail_install_repo ]; then - cd /opt/contrail/contrail_install_repo - dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz -fi +cd /opt/contrail/contrail_install_repo +dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz echo "You may need to run \"apt-get update\" after de-installing the package..." diff --git a/common/debian/contrail-packages/debian/contrail-packages.postrm b/common/debian/contrail-packages/debian/contrail-packages.postrm index b81faa734..e4240db73 100644 --- a/common/debian/contrail-packages/debian/contrail-packages.postrm +++ b/common/debian/contrail-packages/debian/contrail-packages.postrm @@ -4,10 +4,8 @@ line_num=`cat /etc/apt/sources.list | grep -n contrail_install_repo | cut -d ':' sed -i 's%deb file\:\/opt\/contrail\/contrail_install_repo \.\/%%' /etc/apt/sources.list sed -i ''$line_num'{/^$/d}' /etc/apt/sources.list -if [ -d /opt/contrail/contrail_install_repo ]; then - cd /opt/contrail/contrail_install_repo - dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz -fi +cd /opt/contrail/contrail_install_repo +dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz echo "You may need to run \"apt-get update\" after de-installing the package..." diff --git a/common/debian/contrail-packages/debian/rules b/common/debian/contrail-packages/debian/rules index 101d7e014..7ab8f1cbc 100755 --- a/common/debian/contrail-packages/debian/rules +++ b/common/debian/contrail-packages/debian/rules @@ -66,6 +66,7 @@ override_dh_auto_install: # Install files echo BUILDID=`echo $(BUILDTAG) | cut -d '-' -f2 | cut -d '~' -f1` > $(SB_TOP)/tools/packaging/build/VERSION_ubuntu; fi install -p -m 755 $(SB_TOP)/tools/packaging/build/VERSION_ubuntu $(buildroot)$(_contrailopt)/contrail_packages/VERSION + install -p -m 755 $(SETUP_FILE) $(buildroot)$(_contrailopt)/contrail_packages/setup.sh install -p -m 755 $(RM_FILE) $(buildroot)$(_contrailopt)/contrail_packages/remove.sh install -p -m 755 $(SB_TOP)/tools/packaging/build/repo_preferences $(buildroot)$(_contrailopt)/contrail_packages/preferences install -p -m 755 $(SB_TOP)/tools/packaging/build/sources.list $(buildroot)$(_contrailopt)/contrail_packages/sources.list diff --git a/common/debian/contrail-setup/debian/rules b/common/debian/contrail-setup/debian/rules index a61e71bd2..ce411e140 100755 --- a/common/debian/contrail-setup/debian/rules +++ b/common/debian/contrail-setup/debian/rules @@ -61,6 +61,7 @@ override_dh_auto_install: install -d -m 755 $(buildroot)$(_contrailopt) install -d -m 755 $(buildroot)$(_contrailopt)/bin install -d -m 755 $(buildroot)$(_contrailopt)/contrail_packages + install -d -m 755 $(buildroot)$(_contrailopt)/python_packages # Install files install -p -m 644 $(builddist)/debs_list.txt $(buildroot)/etc/contrail/debs_list.txt install -p -m 644 $(builddist)/config_utils.tgz $(buildroot)/opt/contrail/config_utils.tgz @@ -69,6 +70,8 @@ override_dh_auto_install: (cd $(SB_TOP)/tools/provisioning/ContrailProvisioning-0.1dev && ${__python} setup.py install --root=${buildroot} --install-scripts ${_contrailopt}/bin/) install -D -m 755 $(SB_TOP)/tools/provisioning/tools/openstack-status-deb $(buildroot)/usr/bin/openstack-status # install pkgs needed first + install -p -m 644 $(SB_TOP)/distro/third_party/ecdsa-0.10.tar.gz $(buildroot)$(_contrailopt)/python_packages/ecdsa-0.10.tar.gz + install -p -m 644 $(SB_TOP)/distro/third_party/Fabric-1.7.0.tar.gz $(buildroot)$(_contrailopt)/python_packages/Fabric-1.7.0.tar.gz echo BUILDID=`echo $(BUILDTAG) | cut -d '-' -f2 | cut -d '~' -f1` > $(SB_TOP)/tools/packaging/build/VERSION_ubuntu; fi install -p -m 755 $(SB_TOP)/tools/packaging/build/VERSION_ubuntu $(buildroot)$(_contrailopt)/contrail_packages/VERSION install -p -m 755 $(SB_TOP)/tools/packaging/build/sources.list $(buildroot)$(_contrailopt)/contrail_packages/sources.list diff --git a/common/debian/contrail-thirdparty-packages/debian/contrail-thirdparty-packages.postrm b/common/debian/contrail-thirdparty-packages/debian/contrail-thirdparty-packages.postrm index fb52d375e..76b8cfc1a 100644 --- a/common/debian/contrail-thirdparty-packages/debian/contrail-thirdparty-packages.postrm +++ b/common/debian/contrail-thirdparty-packages/debian/contrail-thirdparty-packages.postrm @@ -6,9 +6,7 @@ if [ ! -f /opt/contrail/.contrail_packages ]; then sed -i ''$line_num'{/^$/d}' /etc/apt/sources.list fi -if [ -d /opt/contrail/contrail_install_repo ]; then - cd /opt/contrail/contrail_install_repo - dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz -fi +cd /opt/contrail/contrail_install_repo +dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz echo "You may need to run \"apt-get update\" after de-installing the package..."