openstack/rally-openstack
Code Issues Proposed changes

Switch everything to rally db

Browse Source 
Use `rally db` command instead of `rally-manage db` everywhere

Change-Id: Ief8613d60b0c0a763bd9bf3086d7225f1dfe6905
This commit is contained in:
Boris Pavlovic 2017-08-28 23:43:38 -07:00
parent 07e0f94043
commit 4496b1480b
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/rally
View File

@ -109,7 +109,7 @@ function configure_rally() {
function init_rally() { function init_rally() {
recreate_database rally utf8 recreate_database rally utf8
# Recreate rally database # Recreate rally database
rally-manage --config-file $RALLY_CONF_DIR/$RALLY_CONF_FILE db recreate rally --config-file $RALLY_CONF_DIR/$RALLY_CONF_FILE db recreate
# Add current DevStack deployment to Rally # Add current DevStack deployment to Rally
if [ "$RALLY_ADD_DEPLOYMENT" = "True" ]; then if [ "$RALLY_ADD_DEPLOYMENT" = "True" ]; then
local tmpfile=$(mktemp) local tmpfile=$(mktemp)

4
doc/source/install_and_upgrade/install.rst
View File

@ -94,7 +94,7 @@ complete:
.. code-block:: bash .. code-block:: bash
rally-manage db recreate rally db recreate
.. include:: ../../../devstack/README.rst .. include:: ../../../devstack/README.rst
@ -149,7 +149,7 @@ anything with Rally, but you need to create the database first:
.. code-block:: console .. code-block:: console
user@box:~/rally$ dock_rally user@box:~/rally$ dock_rally
rally@1cc98e0b5941:~$ rally-manage db recreate rally@1cc98e0b5941:~$ rally db recreate
rally@1cc98e0b5941:~$ rally deployment list rally@1cc98e0b5941:~$ rally deployment list
There are no deployments. To create a new deployment, use: There are no deployments. To create a new deployment, use:
rally deployment create rally deployment create

2
doc/specs/in-progress/raas.rst
View File

@ -309,7 +309,7 @@ Rally-as-a-Service itself should be started via new command:
.. code-block:: console .. code-block:: console
$ rally-manage service start $ rally service start
Rally Web Portal Rally Web Portal
---------------- ----------------

2
tests/ci/rally_self_job.sh
View File

@ -29,7 +29,7 @@ RALLY="rally --config-file $TMP_RALLY_CONF"
# Create temp db # Create temp db
cp etc/rally/rally.conf.sample $TMP_RALLY_CONF cp etc/rally/rally.conf.sample $TMP_RALLY_CONF
sed -i.bak "s|#connection =.*|connection = \"$DBCONNSTRING\"|" $TMP_RALLY_CONF sed -i.bak "s|#connection =.*|connection = \"$DBCONNSTRING\"|" $TMP_RALLY_CONF
rally-manage --config-file $TMP_RALLY_CONF db create rally --config-file $TMP_RALLY_CONF db create
# Create self deployment # Create self deployment
echo '{}' > $TMP_RALLY_DEPLOYMENT echo '{}' > $TMP_RALLY_DEPLOYMENT

4
tests/functional/utils.py
View File

@ -117,12 +117,12 @@ class Rally(object):
with open(config_filename, "w") as conf: with open(config_filename, "w") as conf:
config.write(conf) config.write(conf)
self.args = ["rally", "--config-file", config_filename] self.args = ["rally", "--config-file", config_filename]
subprocess.call(["rally-manage", "--config-file", config_filename, subprocess.call(["rally", "--config-file", config_filename,
"db", "recreate"], env=self.env) "db", "recreate"], env=self.env)
self.config_filename = config_filename self.config_filename = config_filename
else: else:
self.args = ["rally"] self.args = ["rally"]
subprocess.call(["rally-manage", "db", "recreate"], env=self.env) subprocess.call(["rally", "db", "recreate"], env=self.env)
self.reports_root = os.environ.get("REPORTS_ROOT", self.reports_root = os.environ.get("REPORTS_ROOT",
"rally-cli-output-files") "rally-cli-output-files")