Merge "Allow screen without logging to disk"
diff --git a/files/debs/ceilometer-collector b/files/debs/ceilometer-collector
index f1b692a..94c82e0 100644
--- a/files/debs/ceilometer-collector
+++ b/files/debs/ceilometer-collector
@@ -1,6 +1,3 @@
python-pymongo #NOPRIME
mongodb-server #NOPRIME
libnspr4-dev
-pkg-config
-libxml2-dev
-libxslt-dev
\ No newline at end of file
diff --git a/files/debs/general b/files/debs/general
index 7bc90a6..58d1e8b 100644
--- a/files/debs/general
+++ b/files/debs/general
@@ -29,3 +29,4 @@
pkg-config
libmysqlclient-dev # MySQL-python
libpq-dev # psycopg2
+zlib1g-dev
diff --git a/files/debs/glance b/files/debs/glance
deleted file mode 100644
index 37877a8..0000000
--- a/files/debs/glance
+++ /dev/null
@@ -1,6 +0,0 @@
-libmysqlclient-dev
-libpq-dev
-libssl-dev
-libxml2-dev
-libxslt1-dev
-zlib1g-dev
diff --git a/files/debs/nova b/files/debs/nova
index d1678a7..fa394e7 100644
--- a/files/debs/nova
+++ b/files/debs/nova
@@ -8,8 +8,6 @@
mysql-server # NOPRIME
python-mysqldb
python-mysql.connector
-libxml2-dev # needed for building lxml
-libxslt1-dev
gawk
iptables
ebtables
diff --git a/files/debs/tempest b/files/debs/tempest
deleted file mode 100644
index bb09529..0000000
--- a/files/debs/tempest
+++ /dev/null
@@ -1,2 +0,0 @@
-libxml2-dev
-libxslt1-dev
diff --git a/files/debs/trove b/files/debs/trove
deleted file mode 100644
index 96f8f29..0000000
--- a/files/debs/trove
+++ /dev/null
@@ -1 +0,0 @@
-libxslt1-dev
diff --git a/files/rpms/general b/files/rpms/general
index 2a45227..eb479d2 100644
--- a/files/rpms/general
+++ b/files/rpms/general
@@ -32,3 +32,4 @@
mariadb-devel # MySQL-python
postgresql-devel # psycopg2
redhat-rpm-config # MySQL-python rhbz-1195207 f21
+zlib-devel
diff --git a/files/rpms/glance b/files/rpms/glance
deleted file mode 100644
index 479194f..0000000
--- a/files/rpms/glance
+++ /dev/null
@@ -1,6 +0,0 @@
-libxml2-devel
-libxslt-devel
-mysql-devel
-openssl-devel
-postgresql-devel
-zlib-devel
diff --git a/files/rpms/keystone b/files/rpms/keystone
index 8074119..7384150 100644
--- a/files/rpms/keystone
+++ b/files/rpms/keystone
@@ -1,4 +1,3 @@
MySQL-python
-libxslt-devel
sqlite
mod_ssl
diff --git a/files/rpms/tempest b/files/rpms/tempest
deleted file mode 100644
index e7bbd43..0000000
--- a/files/rpms/tempest
+++ /dev/null
@@ -1 +0,0 @@
-libxslt-devel
diff --git a/files/rpms/trove b/files/rpms/trove
deleted file mode 100644
index e7bbd43..0000000
--- a/files/rpms/trove
+++ /dev/null
@@ -1 +0,0 @@
-libxslt-devel
diff --git a/functions-common b/functions-common
index ba3c791..5c97aee 100644
--- a/functions-common
+++ b/functions-common
@@ -1072,6 +1072,10 @@
local file_to_parse=""
local service=""
+ if [ $# -ne 1 ]; then
+ die $LINENO "get_packages takes a single, comma-separated argument"
+ fi
+
if [[ -z "$package_dir" ]]; then
echo "No package directory supplied"
return 1
diff --git a/tools/worlddump.py b/tools/worlddump.py
index 1b337a9..97e4d94 100755
--- a/tools/worlddump.py
+++ b/tools/worlddump.py
@@ -86,8 +86,10 @@
def ebtables_dump():
+ tables = ['filter', 'nat', 'broute']
_header("EB Tables Dump")
- _dump_cmd("sudo ebtables -L")
+ for table in tables:
+ _dump_cmd("sudo ebtables -t %s -L" % table)
def iptables_dump():