summaryrefslogtreecommitdiffstats
path: root/apex
diff options
context:
space:
mode:
authorRicardo Noriega <rnoriega@redhat.com>2018-07-23 12:14:59 +0200
committerRicardo Noriega <rnoriega@redhat.com>2018-07-26 10:10:47 +0200
commit70138a393e3641d83c488ee504b7839973e6e9d5 (patch)
treedac921ed8665d8b271595832b9b8bb6e4c69a7c4 /apex
parent82a9bec67b094f6381acb035a9efeffe47b011ab (diff)
Remove obsolete Ceph tags
This patch removes the logic to use an specific tag for Ceph containers. We will use whatever docker image TripleO upstream uses. For aarch64, an ansible task will replace the tag to pull the proper container image. This patch also refactors the preparation of the local registry. In Queens, there is no need to execute twice the overcloud container image prepare command. JIRA: APEX-622 Change-Id: I947d931609e58505675bb460a59d08c1d10d1d0b Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
Diffstat (limited to 'apex')
-rw-r--r--apex/common/constants.py3
-rw-r--r--apex/deploy.py5
-rw-r--r--apex/overcloud/deploy.py10
-rw-r--r--apex/tests/test_apex_overcloud_deploy.py3
4 files changed, 2 insertions, 19 deletions
diff --git a/apex/common/constants.py b/apex/common/constants.py
index 2a10b3b..9c6b2a2 100644
--- a/apex/common/constants.py
+++ b/apex/common/constants.py
@@ -47,9 +47,6 @@ THT_DOCKER_ENV_DIR = {
DEFAULT_OS_VERSION = 'master'
DEFAULT_ODL_VERSION = 'oxygen'
VALID_ODL_VERSIONS = ['carbon', 'nitrogen', 'oxygen', 'master']
-CEPH_VERSION_MAP = {'pike': 'jewel',
- 'queens': 'luminous',
- 'master': 'luminous'}
PUPPET_ODL_URL = 'https://git.opendaylight.org/gerrit/integration/packaging' \
'/puppet-opendaylight'
DEBUG_OVERCLOUD_PW = 'opnfvapex'
diff --git a/apex/deploy.py b/apex/deploy.py
index 9bf9b12..1168292 100644
--- a/apex/deploy.py
+++ b/apex/deploy.py
@@ -430,9 +430,6 @@ def main():
docker_playbook = os.path.join(args.lib_dir, constants.ANSIBLE_PATH,
'prepare_overcloud_containers.yml')
if ds_opts['containers']:
- ceph_version = constants.CEPH_VERSION_MAP[ds_opts['os_version']]
- ceph_docker_image = "ceph/daemon:tag-build-master-" \
- "{}-centos-7".format(ceph_version)
logging.info("Preparing Undercloud with Docker containers")
if patched_containers:
oc_builder.archive_docker_patches(APEX_TEMP_DIR)
@@ -445,7 +442,7 @@ def main():
container_vars['sdn'] = ds_opts['sdn_controller']
container_vars['undercloud_ip'] = undercloud_admin_ip
container_vars['os_version'] = os_version
- container_vars['ceph_docker_image'] = ceph_docker_image
+ container_vars['aarch64'] = platform.machine() == 'aarch64'
container_vars['sdn_env_file'] = \
oc_deploy.get_docker_sdn_file(ds_opts)
try:
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py
index e1af210..439848f 100644
--- a/apex/overcloud/deploy.py
+++ b/apex/overcloud/deploy.py
@@ -694,15 +694,7 @@ def prep_storage_env(ds, ns, virtual, tmp_dir):
print(line)
if ds_opts['containers']:
- undercloud_admin_ip = ns['networks'][con.ADMIN_NETWORK][
- 'installer_vm']['ip']
- ceph_version = con.CEPH_VERSION_MAP[ds_opts['os_version']]
- docker_image = "{}:8787/ceph/daemon:tag-build-master-" \
- "{}-centos-7".format(undercloud_admin_ip,
- ceph_version)
- ceph_params = {
- 'DockerCephDaemonImage': docker_image,
- }
+ ceph_params = {}
# max pgs allowed are calculated as num_mons * 200. Therefore we
# set number of pgs and pools so that the total will be less:
diff --git a/apex/tests/test_apex_overcloud_deploy.py b/apex/tests/test_apex_overcloud_deploy.py
index d12b1a4..17911d5 100644
--- a/apex/tests/test_apex_overcloud_deploy.py
+++ b/apex/tests/test_apex_overcloud_deploy.py
@@ -616,9 +616,6 @@ class TestOvercloudDeploy(unittest.TestCase):
}
prep_storage_env(ds, ns, virtual=True, tmp_dir='/tmp')
ceph_params = {
- 'DockerCephDaemonImage':
- '192.0.2.1:8787/ceph/daemon:tag-build-master-luminous-centos'
- '-7',
'CephPoolDefaultSize': 2,
'CephAnsibleExtraConfig': {
'centos_package_dependencies': [],