summaryrefslogtreecommitdiffstats
path: root/apex/overcloud/deploy.py
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-07-26 19:01:30 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-07-26 19:01:30 +0000
commit1e43a5eaa2c5c61110c871e85f20b1f73ad361f0 (patch)
tree42a1042d671172fe0cfb713f4103115876798d8f /apex/overcloud/deploy.py
parenteafc77d7fdc0f3f418941b3ac20a1dcc9180589b (diff)
parent70138a393e3641d83c488ee504b7839973e6e9d5 (diff)
Merge "Remove obsolete Ceph tags"
Diffstat (limited to 'apex/overcloud/deploy.py')
-rw-r--r--apex/overcloud/deploy.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py
index e1af210d..439848f8 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: