diff options
| -rw-r--r-- | .zuul.yaml | 4 | ||||
| -rw-r--r-- | devstack/settings | 2 | ||||
| -rw-r--r-- | integration/scripts/files/elements/guest-agent/source-repository-guest-agent | 2 | ||||
| -rwxr-xr-x | integration/scripts/trovestack | 2 | ||||
| -rw-r--r-- | integration/scripts/trovestack.rc | 2 | ||||
| -rw-r--r-- | trove/common/cfg.py | 2 | ||||
| -rw-r--r-- | trove/guestagent/api.py | 2 |
7 files changed, 8 insertions, 8 deletions
@@ -470,7 +470,7 @@ guest_os: ubuntu guest_os_release: bionic guest_username: ubuntu - branch: master + branch: yoga dev_mode: false image_suffix: "" @@ -484,6 +484,6 @@ guest_os: ubuntu guest_os_release: bionic guest_username: ubuntu - branch: master + branch: yoga dev_mode: true image_suffix: "-dev" diff --git a/devstack/settings b/devstack/settings index 7a09f869..b4582f63 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/yoga} 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 08996aba..da537c35 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 +guest-agent git /opt/guest-agent https://opendev.org/openstack/trove stable/yoga upper-constraints file /opt/upper-constraints.txt https://releases.openstack.org/constraints/upper/yoga diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack index 0045fff5..094cb422 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/yoga#egg=python-troveclient } # Build trove guest image diff --git a/integration/scripts/trovestack.rc b/integration/scripts/trovestack.rc index eaf74550..cee4a074 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/yoga} 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 65c030cf..0faf11c7 100644 --- a/trove/common/cfg.py +++ b/trove/common/cfg.py @@ -1444,7 +1444,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='yoga', 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 fc146100..e90dbd7c 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', - + 'yoga': '1.1', 'latest': API_LATEST_VERSION } |