diff options
| author | Zuul <zuul@review.openstack.org> | 2018-02-02 18:13:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-02-02 18:13:38 +0000 |
| commit | 4b95da49cb0b04237226f21fa6289367fe2cf1e3 (patch) | |
| tree | 68b4b2c0e776c4c6787bafb6ef852bad628cfa4f | |
| parent | 9a6f476785eaf9fad2a4067f825ea8d257566920 (diff) | |
| parent | 3bc8a63c33a940d03a6ecd3ff059a0e48e7732e1 (diff) | |
| download | trove-4b95da49cb0b04237226f21fa6289367fe2cf1e3.tar.gz | |
Merge "Improve Vertica 9.x support"
| -rwxr-xr-x | integration/scripts/trovestack | 2 | ||||
| -rw-r--r-- | trove/guestagent/datastore/experimental/vertica/system.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack index 840daa9d..aa6e8302 100755 --- a/integration/scripts/trovestack +++ b/integration/scripts/trovestack @@ -590,7 +590,7 @@ function cmd_set_datastore() { VERSION="1.6.1" elif [ "$DATASTORE_TYPE" == "vertica" ]; then PACKAGES=${PACKAGES:-"vertica"} - VERSION="7.1" + VERSION="9.0.1" elif [ "$DATASTORE_TYPE" == "db2" ]; then PACKAGES=${PACKAGES:-""} VERSION="11.1" diff --git a/trove/guestagent/datastore/experimental/vertica/system.py b/trove/guestagent/datastore/experimental/vertica/system.py index 50de1b4f..daae44ef 100644 --- a/trove/guestagent/datastore/experimental/vertica/system.py +++ b/trove/guestagent/datastore/experimental/vertica/system.py @@ -23,7 +23,7 @@ ADD_DB_TO_NODE = ("/opt/vertica/bin/adminTools -t db_add_node -a" " %s -d %s -p '%s'") REMOVE_DB_FROM_NODE = ("/opt/vertica/bin/adminTools -t db_remove_node -s" " %s -d %s -i -p '%s'") -CREATE_DB = ("/opt/vertica/bin/adminTools -t create_db -s" +CREATE_DB = ("echo yes | /opt/vertica/bin/adminTools -t create_db -s" " %s -d %s -c %s -D %s -p '%s'") CREATE_USER = "CREATE USER %s IDENTIFIED BY '%s'" ENABLE_FOR_USER = "ALTER USER %s DEFAULT ROLE %s" @@ -31,7 +31,8 @@ GRANT_TO_USER = "GRANT %s to %s" INSTALL_VERTICA = ("/opt/vertica/sbin/install_vertica -s %s" " -d %s -X -N -S default -r" " /vertica.deb -L CE -Y --no-system-checks" - " --ignore-aws-instance-type") + " --ignore-aws-instance-type" + " --ignore-install-config") MARK_DESIGN_KSAFE = "SELECT MARK_DESIGN_KSAFE(%s)" NODE_STATUS = "SELECT node_state FROM nodes where node_state <> '%s'" STOP_DB = "/opt/vertica/bin/adminTools -t stop_db -F -d %s -p '%s'" |