Merge "Change settings for stable/wallaby" into stable/wallaby

7 files changed, 9 insertions, 9 deletions

diff --git a/.zuul.yaml b/.zuul.yaml
index a1ed54d4..2ab42df3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -369,7 +369,7 @@
       guest_os: ubuntu
       guest_os_release: bionic
       guest_username: ubuntu
-      branch: master
+      branch: wallaby
       dev_mode: false
       image_suffix: ""
 
@@ -383,6 +383,6 @@
       guest_os: ubuntu
       guest_os_release: bionic
       guest_username: ubuntu
-      branch: master
+      branch: wallaby
       dev_mode: true
       image_suffix: "-dev"
diff --git a/devstack/settings b/devstack/settings
index b7be68d0..8c23349e 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -4,7 +4,7 @@
 # Set up default directories
 TROVE_DIR=${TROVE_DIR:-${DEST}/trove}
 TROVE_REPO=${TROVE_REPO:-${GIT_BASE}/openstack/trove.git}
-TROVE_BRANCH=${TROVE_BRANCH:-master}
+TROVE_BRANCH=${TROVE_BRANCH:-stable/wallaby}
 
 TROVE_CLIENT_DIR=${TROVE_CLIENT_DIR:-${TROVECLIENT_DIR:-${DEST}/python-troveclient}}
 TROVE_CLIENT_REPO=${TROVE_CLIENT_REPO:-${TROVECLIENT_REPO:-${GIT_BASE}/openstack/python-troveclient.git}}
diff --git a/integration/scripts/files/elements/guest-agent/source-repository-guest-agent b/integration/scripts/files/elements/guest-agent/source-repository-guest-agent
index 9860bac6..0492deb5 100644
--- a/integration/scripts/files/elements/guest-agent/source-repository-guest-agent
+++ b/integration/scripts/files/elements/guest-agent/source-repository-guest-agent
@@ -1,3 +1,3 @@
 # This is used for source-based builds
-guest-agent git /opt/guest-agent https://opendev.org/openstack/trove master
-upper-constraints file /opt/upper-constraints.txt https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt
+guest-agent git /opt/guest-agent https://opendev.org/openstack/trove stable/wallaby
+upper-constraints file /opt/upper-constraints.txt https://releases.openstack.org/constraints/upper/wallaby
diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack
index 0045fff5..a5799c20 100755
--- a/integration/scripts/trovestack
+++ b/integration/scripts/trovestack
@@ -721,7 +721,7 @@ function cmd_test_init() {
 
     exclaim "Re-installing python-troveclient from git"
     pip3 uninstall -y python-troveclient
-    pip3 install -U git+https://opendev.org/openstack/python-troveclient@master#egg=python-troveclient
+    pip3 install -U git+https://opendev.org/openstack/python-troveclient@stable/wallaby#egg=python-troveclient
 }
 
 # Build trove guest image
diff --git a/integration/scripts/trovestack.rc b/integration/scripts/trovestack.rc
index eaf74550..d29231e0 100644
--- a/integration/scripts/trovestack.rc
+++ b/integration/scripts/trovestack.rc
@@ -59,7 +59,7 @@ GIT_OPENSTACK=${GIT_OPENSTACK:-${GIT_BASE}/openstack}
 DEVSTACK_REPO=${DEVSTACK_REPO:-${GIT_BASE}/openstack-dev/devstack.git}
 TROVE_REPO=${TROVE_REPO:-${GIT_OPENSTACK}/trove.git}
 TROVE_DIR=${TROVE_DIR:-${PATH_TROVE}}
-TROVE_BRANCH=${TROVE_BRANCH:-master}
+TROVE_BRANCH=${TROVE_BRANCH:-stable/wallaby}
 TROVE_CLIENT_REPO=${TROVE_CLIENT_REPO:-${TROVECLIENT_REPO:-${GIT_OPENSTACK}/python-troveclient.git}}
 TROVE_CLIENT_DIR=${TROVE_CLIENT_DIR:-${TROVECLIENT_DIR:-${PATH_PYTHON_TROVECLIENT}}}
 TROVE_CLIENT_BRANCH=${TROVE_CLIENT_BRANCH:-${TROVECLIENT_BRANCH:-master}}
diff --git a/trove/common/cfg.py b/trove/common/cfg.py
index a490b431..fede115e 100644
--- a/trove/common/cfg.py
+++ b/trove/common/cfg.py
@@ -1432,7 +1432,7 @@ rpcapi_cap_opts = [
         'taskmanager', default='latest',
         help='Set a version cap for messages sent to taskmanager services'),
     cfg.StrOpt(
-        'guestagent', default='latest',
+        'guestagent', default='wallaby',
         help='Set a version cap for messages sent to guestagent services'),
     cfg.StrOpt(
         'conductor', default='latest',
diff --git a/trove/guestagent/api.py b/trove/guestagent/api.py
index eb50b464..66182667 100644
--- a/trove/guestagent/api.py
+++ b/trove/guestagent/api.py
@@ -60,7 +60,7 @@ class API(object):
         'newton': '1.0',
         'ussuri': '1.0',
         'victoria': '1.1',
-
+        'wallaby': '1.1',
         'latest': API_LATEST_VERSION
     }