Skip to content

Instantly share code, notes, and snippets.

@cp16net
cp16net / gist:8d6ee5f0fab77248b7f5
Created November 14, 2014 19:35
squeeze e2fsck cmd differences
root@mysql511-alt-guest:/# e2fsck -f -n /dev/vdb
e2fsck 1.41.12 (17-May-2010)
Warning! /dev/vdb is mounted.
Warning: skipping journal recovery because doing a read-only filesystem check.
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
/lost+found not found. Create? no
Pass 4: Checking reference counts
[
{
"name": "auto_increment_increment",
"min_size": "1",
"datastore_version_id": "1379cc8b-4bc5-4c4a-9e9d-7a9ad27c0866",
"restart_required": false,
"type": "integer",
"max_size": "65535"
},
diff --git a/src/nova/guest/apt/apt.cc b/src/nova/guest/apt/apt.cc
index e55b6a8..35c1fa3 100644
--- a/src/nova/guest/apt/apt.cc
+++ b/src/nova/guest/apt/apt.cc
@@ -323,7 +323,7 @@ void AptGuest::write_file(const char * name, const char * file_ext,
file << file_contents.get();
file.close();
NOVA_LOG_INFO("Copying new %s file into place.", name);
- string file_name = str(format("/etc/apt/%s%s.d/cdb") % name % file_ext);
+ string file_name = str(format("/etc/apt/%s.d/cdb%s") % name % file_ext);
diff --git a/troveclient/v1/client.py b/troveclient/v1/client.py
index 1b42cb5..0282d03 100644
--- a/troveclient/v1/client.py
+++ b/troveclient/v1/client.py
@@ -26,7 +26,7 @@ from troveclient.v1 import metadata
from troveclient.v1 import root
from troveclient.v1 import security_groups
from troveclient.v1 import users
-
+from troveclient.v1 import management
diff --git a/scripts/files/elements/ubuntu-percona/pre-install.d/10-percona-apt-key b/scripts/files/elements/ubuntu-pe
index 7db291c..9133c37 100755
--- a/scripts/files/elements/ubuntu-percona/pre-install.d/10-percona-apt-key
+++ b/scripts/files/elements/ubuntu-percona/pre-install.d/10-percona-apt-key
@@ -14,7 +14,7 @@ if [ ! -e /home/${GUEST_USERNAME}/.gnupg ]; then
mkdir -p /home/${GUEST_USERNAME}/.gnupg
fi
-apt-key adv --keyserver hkp://keys.gnupg.net --recv-keys 1C4CBDCDCD2EFD2A
+apt-key adv --keyserver hkp://keys.gnupg.net:80 --recv-keys 1C4CBDCDCD2EFD2A
diff --git a/scripts/files/elements/ubuntu-percona/pre-install.d/10-percona-apt-key b/scripts/files/elements/ubuntu-pe
index 7db291c..9133c37 100755
--- a/scripts/files/elements/ubuntu-percona/pre-install.d/10-percona-apt-key
+++ b/scripts/files/elements/ubuntu-percona/pre-install.d/10-percona-apt-key
@@ -14,7 +14,7 @@ if [ ! -e /home/${GUEST_USERNAME}/.gnupg ]; then
mkdir -p /home/${GUEST_USERNAME}/.gnupg
fi
-apt-key adv --keyserver hkp://keys.gnupg.net --recv-keys 1C4CBDCDCD2EFD2A
+apt-key adv --keyserver hkp://keys.gnupg.net:80 --recv-keys 1C4CBDCDCD2EFD2A
2014-04-28 21:45:11.967 ERROR keystoneclient.common.cms [-] Signing error: Error opening signer certificate /etc/keystone/ssl/certs/signing_cert.pem
140722309220000:error:02001002:system library:fopen:No such file or directory:bss_file.c:398:fopen('/etc/keystone/ssl/certs/signing_cert.pem','r')
140722309220000:error:20074002:BIO routines:FILE_CTRL:system lib:bss_file.c:400:
unable to load certificate
2014-04-28 21:45:11.968 ERROR keystone.common.wsgi [-] Command 'openssl' returned non-zero exit status 3
2014-04-28 21:45:11.968 TRACE keystone.common.wsgi Traceback (most recent call last):
2014-04-28 21:45:11.968 TRACE keystone.common.wsgi File "/opt/stack/keystone/keystone/common/wsgi.py", line 207, in __call__
2014-04-28 21:45:11.968 TRACE keystone.common.wsgi result = method(context, **params)
2014-04-28 21:45:11.968 TRACE keystone.common.wsgi File "/opt/stack/keystone/keystone/common/controller.py", line 152, in inner
+ [[ 0 -ne 0 ]]
+ IMAGE=/home/vagrant/devstack/files/cirros-0.3.1-x86_64-uec.tar.gz
+ [[ http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz =~ openvz ]]
+ [[ http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz =~ \.vmdk ]]
+ [[ http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz =~ \.vhd\.tgz ]]
+ [[ http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz =~ \.xen-raw\.tgz ]]
+ KERNEL=
+ RAMDISK=
+ DISK_FORMAT=
+ CONTAINER_FORMAT=
{
"color_scheme": "Packages/Theme - Flatland/Flatland Dark.tmTheme",
"ensure_newline_at_eof_on_save": true,
"flatland_sidebar_tree_xsmall": true,
"flatland_square_tabs": true,
"font_size": 11.0,
"ignored_packages":
[
"Vintage"
],
diff --git a/trove/common/configurations.py b/trove/common/configurations.py
index ea2b28f..87111c1 100644
--- a/trove/common/configurations.py
+++ b/trove/common/configurations.py
@@ -78,6 +78,12 @@ class MySQLConfParser(object):
continue
elif line_clean.startswith(':'):
continue
+ # python 2.6 configparser doesnt like params without values
+ elif line_clean.startswith('[') and line_clean.endswith(']'):