From 4496b1480bfc6dbf1a6fb7a5baee3e85bb4280e3 Mon Sep 17 00:00:00 2001
From: Boris Pavlovic <boris@pavlovic.me>
Date: Mon, 28 Aug 2017 23:43:38 -0700
Subject: [PATCH] Switch everything to `rally db`

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

Change-Id: Ief8613d60b0c0a763bd9bf3086d7225f1dfe6905
---
 devstack/lib/rally                         | 2 +-
 doc/source/install_and_upgrade/install.rst | 4 ++--
 doc/specs/in-progress/raas.rst             | 2 +-
 tests/ci/rally_self_job.sh                 | 2 +-
 tests/functional/utils.py                  | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/devstack/lib/rally b/devstack/lib/rally
index 4a0f4b00..94b3a25a 100644
--- a/devstack/lib/rally
+++ b/devstack/lib/rally
@@ -109,7 +109,7 @@ function configure_rally() {
 function init_rally() {
     recreate_database rally utf8
     # 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
     if [ "$RALLY_ADD_DEPLOYMENT" = "True" ]; then
         local tmpfile=$(mktemp)
diff --git a/doc/source/install_and_upgrade/install.rst b/doc/source/install_and_upgrade/install.rst
index f9b5f1d4..6ae29a92 100644
--- a/doc/source/install_and_upgrade/install.rst
+++ b/doc/source/install_and_upgrade/install.rst
@@ -94,7 +94,7 @@ complete:
 
 .. code-block:: bash
 
-   rally-manage db recreate
+   rally db recreate
 
 .. include:: ../../../devstack/README.rst
 
@@ -149,7 +149,7 @@ anything with Rally, but you need to create the database first:
 .. code-block:: console
 
    user@box:~/rally$ dock_rally
-   rally@1cc98e0b5941:~$ rally-manage db recreate
+   rally@1cc98e0b5941:~$ rally db recreate
    rally@1cc98e0b5941:~$ rally deployment list
    There are no deployments. To create a new deployment, use:
    rally deployment create
diff --git a/doc/specs/in-progress/raas.rst b/doc/specs/in-progress/raas.rst
index e14fb7ef..880ff05b 100644
--- a/doc/specs/in-progress/raas.rst
+++ b/doc/specs/in-progress/raas.rst
@@ -309,7 +309,7 @@ Rally-as-a-Service itself should be started via new command:
 
   .. code-block:: console
 
-    $ rally-manage service start
+    $ rally service start
 
 Rally Web Portal
 ----------------
diff --git a/tests/ci/rally_self_job.sh b/tests/ci/rally_self_job.sh
index 5960c65b..a377efa1 100755
--- a/tests/ci/rally_self_job.sh
+++ b/tests/ci/rally_self_job.sh
@@ -29,7 +29,7 @@ RALLY="rally --config-file $TMP_RALLY_CONF"
 # Create temp db
 cp etc/rally/rally.conf.sample $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
 echo '{}' > $TMP_RALLY_DEPLOYMENT
diff --git a/tests/functional/utils.py b/tests/functional/utils.py
index 46ebe724..2369749b 100644
--- a/tests/functional/utils.py
+++ b/tests/functional/utils.py
@@ -117,12 +117,12 @@ class Rally(object):
             with open(config_filename, "w") as conf:
                 config.write(conf)
             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)
             self.config_filename = config_filename
         else:
             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",
                                            "rally-cli-output-files")