Browse code
Merge "Rename apts to debs"
Jenkins authored on 2014/12/04 00:56:53Showing 60 changed files
- files/apts
- files/apts/baremetal
- files/apts/ceilometer-collector
- files/apts/ceph
- files/apts/cinder
- files/apts/dstat
- files/apts/general
- files/apts/glance
- files/apts/heat
- files/apts/horizon
- files/apts/ironic
- files/apts/keystone
- files/apts/ldap
- files/apts/n-api
- files/apts/n-cpu
- files/apts/n-novnc
- files/apts/neutron
- files/apts/nova
- files/apts/openvswitch
- files/apts/postgresql
- files/apts/q-agt
- files/apts/q-l3
- files/apts/qpid
- files/apts/ryu
- files/apts/swift
- files/apts/tempest
- files/apts/tls-proxy
- files/apts/trema
- files/apts/trove
- files/apts/zaqar-server
- files/debs/baremetal
- files/debs/ceilometer-collector
- files/debs/ceph
- files/debs/cinder
- files/debs/dstat
- files/debs/general
- files/debs/glance
- files/debs/heat
- files/debs/horizon
- files/debs/ironic
- files/debs/keystone
- files/debs/ldap
- files/debs/n-api
- files/debs/n-cpu
- files/debs/n-novnc
- files/debs/neutron
- files/debs/nova
- files/debs/openvswitch
- files/debs/postgresql
- files/debs/q-agt
- files/debs/q-l3
- files/debs/qpid
- files/debs/ryu
- files/debs/swift
- files/debs/tempest
- files/debs/tls-proxy
- files/debs/trema
- files/debs/trove
- files/debs/zaqar-server
- functions-common
| 2 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,30 +0,0 @@ |
| 1 |
-bridge-utils |
|
| 2 |
-pylint |
|
| 3 |
-python-setuptools |
|
| 4 |
-screen |
|
| 5 |
-unzip |
|
| 6 |
-wget |
|
| 7 |
-psmisc |
|
| 8 |
-gcc |
|
| 9 |
-git |
|
| 10 |
-graphviz # testonly - docs |
|
| 11 |
-lsof # useful when debugging |
|
| 12 |
-openssh-server |
|
| 13 |
-openssl |
|
| 14 |
-python-virtualenv |
|
| 15 |
-python-unittest2 |
|
| 16 |
-iputils-ping |
|
| 17 |
-wget |
|
| 18 |
-curl |
|
| 19 |
-tcpdump |
|
| 20 |
-euca2ools # only for testing client |
|
| 21 |
-tar |
|
| 22 |
-python-cmd2 # dist:precise |
|
| 23 |
-python-dev |
|
| 24 |
-python-mock # testonly |
|
| 25 |
-python2.7 |
|
| 26 |
-bc |
|
| 27 |
-libyaml-dev |
|
| 28 |
-libffi-dev |
|
| 29 |
-libssl-dev # for pyOpenSSL |
|
| 30 |
-gettext # used for compiling message catalogs |
| 31 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,14 +0,0 @@ |
| 1 |
-libmysqlclient-dev # testonly |
|
| 2 |
-libpq-dev # testonly |
|
| 3 |
-libssl-dev # testonly |
|
| 4 |
-libxml2-dev |
|
| 5 |
-libxslt1-dev # testonly |
|
| 6 |
-python-eventlet |
|
| 7 |
-python-routes |
|
| 8 |
-python-greenlet |
|
| 9 |
-python-sqlalchemy |
|
| 10 |
-python-wsgiref |
|
| 11 |
-python-pastedeploy |
|
| 12 |
-python-xattr |
|
| 13 |
-python-iso8601 |
|
| 14 |
-zlib1g-dev # testonly |
| 2 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,20 +0,0 @@ |
| 1 |
-apache2 # NOPRIME |
|
| 2 |
-libapache2-mod-wsgi # NOPRIME |
|
| 3 |
-python-beautifulsoup |
|
| 4 |
-python-dateutil |
|
| 5 |
-python-paste |
|
| 6 |
-python-pastedeploy |
|
| 7 |
-python-anyjson |
|
| 8 |
-python-routes |
|
| 9 |
-python-xattr |
|
| 10 |
-python-sqlalchemy |
|
| 11 |
-python-webob |
|
| 12 |
-pylint |
|
| 13 |
-python-eventlet |
|
| 14 |
-python-nose |
|
| 15 |
-python-sphinx |
|
| 16 |
-python-mox |
|
| 17 |
-python-coverage |
|
| 18 |
-python-cherrypy3 # why? |
|
| 19 |
-python-migrate |
|
| 20 |
-libpcre3-dev # pyScss |
| 21 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,18 +0,0 @@ |
| 1 |
-docker.io |
|
| 2 |
-ipmitool |
|
| 3 |
-iptables |
|
| 4 |
-ipxe |
|
| 5 |
-libguestfs0 |
|
| 6 |
-libvirt-bin |
|
| 7 |
-openssh-client |
|
| 8 |
-openvswitch-switch |
|
| 9 |
-openvswitch-datapath-dkms |
|
| 10 |
-python-libguestfs |
|
| 11 |
-python-libvirt |
|
| 12 |
-qemu |
|
| 13 |
-qemu-kvm |
|
| 14 |
-qemu-utils |
|
| 15 |
-sgabios |
|
| 16 |
-syslinux |
|
| 17 |
-tftpd-hpa |
|
| 18 |
-xinetd |
| 19 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,15 +0,0 @@ |
| 1 |
-python-lxml |
|
| 2 |
-python-pastescript |
|
| 3 |
-python-pastedeploy |
|
| 4 |
-python-paste |
|
| 5 |
-sqlite3 |
|
| 6 |
-python-pysqlite2 |
|
| 7 |
-python-sqlalchemy |
|
| 8 |
-python-mysqldb |
|
| 9 |
-python-mysql.connector |
|
| 10 |
-python-webob |
|
| 11 |
-python-greenlet |
|
| 12 |
-python-routes |
|
| 13 |
-libldap2-dev |
|
| 14 |
-libsasl2-dev |
|
| 15 |
-libkrb5-dev |
| 2 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,26 +0,0 @@ |
| 1 |
-ebtables |
|
| 2 |
-iptables |
|
| 3 |
-iputils-ping |
|
| 4 |
-iputils-arping |
|
| 5 |
-libmysqlclient-dev # testonly |
|
| 6 |
-mysql-server #NOPRIME |
|
| 7 |
-sudo |
|
| 8 |
-python-iso8601 |
|
| 9 |
-python-paste |
|
| 10 |
-python-routes |
|
| 11 |
-python-suds |
|
| 12 |
-python-pastedeploy |
|
| 13 |
-python-greenlet |
|
| 14 |
-python-eventlet |
|
| 15 |
-python-sqlalchemy |
|
| 16 |
-python-mysqldb |
|
| 17 |
-python-mysql.connector |
|
| 18 |
-python-pyudev |
|
| 19 |
-python-qpid # NOPRIME |
|
| 20 |
-dnsmasq-base |
|
| 21 |
-dnsmasq-utils # for dhcp_release only available in dist:precise |
|
| 22 |
-rabbitmq-server # NOPRIME |
|
| 23 |
-qpidd # NOPRIME |
|
| 24 |
-sqlite3 |
|
| 25 |
-vlan |
|
| 26 |
-radvd # NOPRIME |
| 27 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,48 +0,0 @@ |
| 1 |
-dnsmasq-base |
|
| 2 |
-dnsmasq-utils # for dhcp_release |
|
| 3 |
-conntrack |
|
| 4 |
-kpartx |
|
| 5 |
-parted |
|
| 6 |
-iputils-arping |
|
| 7 |
-libmysqlclient-dev # testonly |
|
| 8 |
-mysql-server # NOPRIME |
|
| 9 |
-python-mysqldb |
|
| 10 |
-python-mysql.connector |
|
| 11 |
-python-xattr # needed for glance which is needed for nova --- this shouldn't be here |
|
| 12 |
-python-lxml # needed for glance which is needed for nova --- this shouldn't be here |
|
| 13 |
-gawk |
|
| 14 |
-iptables |
|
| 15 |
-ebtables |
|
| 16 |
-sqlite3 |
|
| 17 |
-sudo |
|
| 18 |
-qemu-kvm # NOPRIME |
|
| 19 |
-qemu # dist:wheezy,jessie NOPRIME |
|
| 20 |
-libvirt-bin # NOPRIME |
|
| 21 |
-libvirt-dev # NOPRIME |
|
| 22 |
-pm-utils |
|
| 23 |
-libjs-jquery-tablesorter # Needed for coverage html reports |
|
| 24 |
-vlan |
|
| 25 |
-curl |
|
| 26 |
-genisoimage # required for config_drive |
|
| 27 |
-rabbitmq-server # NOPRIME |
|
| 28 |
-qpidd # NOPRIME |
|
| 29 |
-socat # used by ajaxterm |
|
| 30 |
-python-mox |
|
| 31 |
-python-paste |
|
| 32 |
-python-migrate |
|
| 33 |
-python-greenlet |
|
| 34 |
-python-libvirt # NOPRIME |
|
| 35 |
-python-libxml2 |
|
| 36 |
-python-routes |
|
| 37 |
-python-numpy # used by websockify for spice console |
|
| 38 |
-python-pastedeploy |
|
| 39 |
-python-eventlet |
|
| 40 |
-python-cheetah |
|
| 41 |
-python-tempita |
|
| 42 |
-python-sqlalchemy |
|
| 43 |
-python-suds |
|
| 44 |
-python-lockfile |
|
| 45 |
-python-m2crypto |
|
| 46 |
-python-feedparser |
|
| 47 |
-python-iso8601 |
|
| 48 |
-python-qpid # NOPRIME |
| 0 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,30 @@ |
| 0 |
+bridge-utils |
|
| 1 |
+pylint |
|
| 2 |
+python-setuptools |
|
| 3 |
+screen |
|
| 4 |
+unzip |
|
| 5 |
+wget |
|
| 6 |
+psmisc |
|
| 7 |
+gcc |
|
| 8 |
+git |
|
| 9 |
+graphviz # testonly - docs |
|
| 10 |
+lsof # useful when debugging |
|
| 11 |
+openssh-server |
|
| 12 |
+openssl |
|
| 13 |
+python-virtualenv |
|
| 14 |
+python-unittest2 |
|
| 15 |
+iputils-ping |
|
| 16 |
+wget |
|
| 17 |
+curl |
|
| 18 |
+tcpdump |
|
| 19 |
+euca2ools # only for testing client |
|
| 20 |
+tar |
|
| 21 |
+python-cmd2 # dist:precise |
|
| 22 |
+python-dev |
|
| 23 |
+python-mock # testonly |
|
| 24 |
+python2.7 |
|
| 25 |
+bc |
|
| 26 |
+libyaml-dev |
|
| 27 |
+libffi-dev |
|
| 28 |
+libssl-dev # for pyOpenSSL |
|
| 29 |
+gettext # used for compiling message catalogs |
| 0 | 30 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,14 @@ |
| 0 |
+libmysqlclient-dev # testonly |
|
| 1 |
+libpq-dev # testonly |
|
| 2 |
+libssl-dev # testonly |
|
| 3 |
+libxml2-dev |
|
| 4 |
+libxslt1-dev # testonly |
|
| 5 |
+python-eventlet |
|
| 6 |
+python-routes |
|
| 7 |
+python-greenlet |
|
| 8 |
+python-sqlalchemy |
|
| 9 |
+python-wsgiref |
|
| 10 |
+python-pastedeploy |
|
| 11 |
+python-xattr |
|
| 12 |
+python-iso8601 |
|
| 13 |
+zlib1g-dev # testonly |
| 0 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,20 @@ |
| 0 |
+apache2 # NOPRIME |
|
| 1 |
+libapache2-mod-wsgi # NOPRIME |
|
| 2 |
+python-beautifulsoup |
|
| 3 |
+python-dateutil |
|
| 4 |
+python-paste |
|
| 5 |
+python-pastedeploy |
|
| 6 |
+python-anyjson |
|
| 7 |
+python-routes |
|
| 8 |
+python-xattr |
|
| 9 |
+python-sqlalchemy |
|
| 10 |
+python-webob |
|
| 11 |
+pylint |
|
| 12 |
+python-eventlet |
|
| 13 |
+python-nose |
|
| 14 |
+python-sphinx |
|
| 15 |
+python-mox |
|
| 16 |
+python-coverage |
|
| 17 |
+python-cherrypy3 # why? |
|
| 18 |
+python-migrate |
|
| 19 |
+libpcre3-dev # pyScss |
| 0 | 20 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,18 @@ |
| 0 |
+docker.io |
|
| 1 |
+ipmitool |
|
| 2 |
+iptables |
|
| 3 |
+ipxe |
|
| 4 |
+libguestfs0 |
|
| 5 |
+libvirt-bin |
|
| 6 |
+openssh-client |
|
| 7 |
+openvswitch-switch |
|
| 8 |
+openvswitch-datapath-dkms |
|
| 9 |
+python-libguestfs |
|
| 10 |
+python-libvirt |
|
| 11 |
+qemu |
|
| 12 |
+qemu-kvm |
|
| 13 |
+qemu-utils |
|
| 14 |
+sgabios |
|
| 15 |
+syslinux |
|
| 16 |
+tftpd-hpa |
|
| 17 |
+xinetd |
| 0 | 18 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,15 @@ |
| 0 |
+python-lxml |
|
| 1 |
+python-pastescript |
|
| 2 |
+python-pastedeploy |
|
| 3 |
+python-paste |
|
| 4 |
+sqlite3 |
|
| 5 |
+python-pysqlite2 |
|
| 6 |
+python-sqlalchemy |
|
| 7 |
+python-mysqldb |
|
| 8 |
+python-mysql.connector |
|
| 9 |
+python-webob |
|
| 10 |
+python-greenlet |
|
| 11 |
+python-routes |
|
| 12 |
+libldap2-dev |
|
| 13 |
+libsasl2-dev |
|
| 14 |
+libkrb5-dev |
| 0 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,26 @@ |
| 0 |
+ebtables |
|
| 1 |
+iptables |
|
| 2 |
+iputils-ping |
|
| 3 |
+iputils-arping |
|
| 4 |
+libmysqlclient-dev # testonly |
|
| 5 |
+mysql-server #NOPRIME |
|
| 6 |
+sudo |
|
| 7 |
+python-iso8601 |
|
| 8 |
+python-paste |
|
| 9 |
+python-routes |
|
| 10 |
+python-suds |
|
| 11 |
+python-pastedeploy |
|
| 12 |
+python-greenlet |
|
| 13 |
+python-eventlet |
|
| 14 |
+python-sqlalchemy |
|
| 15 |
+python-mysqldb |
|
| 16 |
+python-mysql.connector |
|
| 17 |
+python-pyudev |
|
| 18 |
+python-qpid # NOPRIME |
|
| 19 |
+dnsmasq-base |
|
| 20 |
+dnsmasq-utils # for dhcp_release only available in dist:precise |
|
| 21 |
+rabbitmq-server # NOPRIME |
|
| 22 |
+qpidd # NOPRIME |
|
| 23 |
+sqlite3 |
|
| 24 |
+vlan |
|
| 25 |
+radvd # NOPRIME |
| 0 | 26 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,48 @@ |
| 0 |
+dnsmasq-base |
|
| 1 |
+dnsmasq-utils # for dhcp_release |
|
| 2 |
+conntrack |
|
| 3 |
+kpartx |
|
| 4 |
+parted |
|
| 5 |
+iputils-arping |
|
| 6 |
+libmysqlclient-dev # testonly |
|
| 7 |
+mysql-server # NOPRIME |
|
| 8 |
+python-mysqldb |
|
| 9 |
+python-mysql.connector |
|
| 10 |
+python-xattr # needed for glance which is needed for nova --- this shouldn't be here |
|
| 11 |
+python-lxml # needed for glance which is needed for nova --- this shouldn't be here |
|
| 12 |
+gawk |
|
| 13 |
+iptables |
|
| 14 |
+ebtables |
|
| 15 |
+sqlite3 |
|
| 16 |
+sudo |
|
| 17 |
+qemu-kvm # NOPRIME |
|
| 18 |
+qemu # dist:wheezy,jessie NOPRIME |
|
| 19 |
+libvirt-bin # NOPRIME |
|
| 20 |
+libvirt-dev # NOPRIME |
|
| 21 |
+pm-utils |
|
| 22 |
+libjs-jquery-tablesorter # Needed for coverage html reports |
|
| 23 |
+vlan |
|
| 24 |
+curl |
|
| 25 |
+genisoimage # required for config_drive |
|
| 26 |
+rabbitmq-server # NOPRIME |
|
| 27 |
+qpidd # NOPRIME |
|
| 28 |
+socat # used by ajaxterm |
|
| 29 |
+python-mox |
|
| 30 |
+python-paste |
|
| 31 |
+python-migrate |
|
| 32 |
+python-greenlet |
|
| 33 |
+python-libvirt # NOPRIME |
|
| 34 |
+python-libxml2 |
|
| 35 |
+python-routes |
|
| 36 |
+python-numpy # used by websockify for spice console |
|
| 37 |
+python-pastedeploy |
|
| 38 |
+python-eventlet |
|
| 39 |
+python-cheetah |
|
| 40 |
+python-tempita |
|
| 41 |
+python-sqlalchemy |
|
| 42 |
+python-suds |
|
| 43 |
+python-lockfile |
|
| 44 |
+python-m2crypto |
|
| 45 |
+python-feedparser |
|
| 46 |
+python-iso8601 |
|
| 47 |
+python-qpid # NOPRIME |
| ... | ... |
@@ -945,7 +945,7 @@ function get_or_create_endpoint {
|
| 945 | 945 |
function _get_package_dir {
|
| 946 | 946 |
local pkg_dir |
| 947 | 947 |
if is_ubuntu; then |
| 948 |
- pkg_dir=$FILES/apts |
|
| 948 |
+ pkg_dir=$FILES/debs |
|
| 949 | 949 |
elif is_fedora; then |
| 950 | 950 |
pkg_dir=$FILES/rpms |
| 951 | 951 |
elif is_suse; then |
| ... | ... |
@@ -975,7 +975,7 @@ function apt_get {
|
| 975 | 975 |
} |
| 976 | 976 |
|
| 977 | 977 |
# get_packages() collects a list of package names of any type from the |
| 978 |
-# prerequisite files in ``files/{apts|rpms}``. The list is intended
|
|
| 978 |
+# prerequisite files in ``files/{debs|rpms}``. The list is intended
|
|
| 979 | 979 |
# to be passed to a package installer such as apt or yum. |
| 980 | 980 |
# |
| 981 | 981 |
# Only packages required for the services in 1st argument will be |