Skip to content

Commit

Permalink
Revert "Cloud changes for packaging"
Browse files Browse the repository at this point in the history 
This reverts commit 242eb41
  • Loading branch information
@vmahuli @opencontrail-ci-admin
vmahuli authored and opencontrail-ci-admin committed Apr 22, 2015
1 parent 242eb41 commit d744d20
Show file tree
Hide file tree
Showing 33 changed files with 284 additions and 534 deletions.
11 changes: 0 additions & 11 deletions build/libs/packager/common.py
View file
Expand Up @@ -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)
Expand Down
53 changes: 15 additions & 38 deletions build/package_configs/ubuntu1204/havana/contrail_packages.cfg
View file
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit d744d20

Please sign in to comment.