import ceph quincy 17.2.6

[ceph.git] / ceph / src / cephadm / box / box.py

diff --git a/ceph/src/cephadm/box/box.py b/ceph/src/cephadm/box/box.py
index 000e9adb88965a7ede1bfb4d8d4dff61e86e1039..6c4dd7fd782957e711963d2be4192f03e9b84949 100755 (executable)
--- a/ceph/src/cephadm/box/box.py
+++ b/ceph/src/cephadm/box/box.py
@@ -17,7 +17,7 @@ from util import (
     run_shell_command,
 )
 
-CEPH_IMAGE = 'quay.ceph.io/ceph-ci/ceph:master'
+CEPH_IMAGE = 'quay.ceph.io/ceph-ci/ceph:main'
 BOX_IMAGE = 'cephadm-box:latest'
 
 # NOTE: this image tar is a trickeroo so cephadm won't pull the image everytime
@@ -112,11 +112,11 @@ class Cluster(Target):
 
         run_shell_command('docker load < /cephadm/box/docker/ceph/image/quay.ceph.image.tar')
         # cephadm guid error because it sometimes tries to use quay.ceph.io/ceph-ci/ceph:<none>
-        # instead of master's tag
+        # instead of main branch's tag
         run_shell_command('export CEPH_SOURCE_FOLDER=/ceph')
-        run_shell_command('export CEPHADM_IMAGE=quay.ceph.io/ceph-ci/ceph:master')
+        run_shell_command('export CEPHADM_IMAGE=quay.ceph.io/ceph-ci/ceph:main')
         run_shell_command(
-            'echo "export CEPHADM_IMAGE=quay.ceph.io/ceph-ci/ceph:master" >> ~/.bashrc'
+            'echo "export CEPHADM_IMAGE=quay.ceph.io/ceph-ci/ceph:main" >> ~/.bashrc'
         )
 
         extra_args = []