diff options
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/builders/undercloud_builder.py | 1 | ||||
| -rw-r--r-- | apex/common/constants.py | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/apex/builders/undercloud_builder.py b/apex/builders/undercloud_builder.py index 47d2568d..4edde5a6 100644 --- a/apex/builders/undercloud_builder.py +++ b/apex/builders/undercloud_builder.py @@ -28,7 +28,6 @@ def add_upstream_packages(image): pkgs = [ 'epel-release', 'openstack-utils', - 'python2-networking-sfc', 'openstack-ironic-inspector', 'subunit-filters', 'docker-distribution', diff --git a/apex/common/constants.py b/apex/common/constants.py index 59988f74..01cb2b7b 100644 --- a/apex/common/constants.py +++ b/apex/common/constants.py @@ -41,7 +41,7 @@ THT_DIR = '/usr/share/openstack-tripleo-heat-templates' THT_ENV_DIR = os.path.join(THT_DIR, 'environments') THT_DOCKER_ENV_DIR = os.path.join(THT_ENV_DIR, 'services') -DEFAULT_OS_VERSION = 'master' +DEFAULT_OS_VERSION = 'rocky' DEFAULT_ODL_VERSION = 'oxygen' VALID_ODL_VERSIONS = ['carbon', 'nitrogen', 'oxygen', 'fluorine', 'neon', 'master'] @@ -51,8 +51,8 @@ DEBUG_OVERCLOUD_PW = 'opnfvapex' NET_ENV_FILE = 'network-environment.yaml' DEPLOY_TIMEOUT = 120 RDO_TAG = 'current-tripleo' -UPSTREAM_RDO = "https://images.rdoproject.org/master/rdo_trunk/{}/".format( - RDO_TAG) +UPSTREAM_RDO = "https://images.rdoproject.org/{}/rdo_trunk/{}/".format( + DEFAULT_OS_VERSION, RDO_TAG) OPENSTACK_GERRIT = 'https://review.opendev.org' DOCKER_TAG = RDO_TAG |