From: Sage Weil <sage@redhat.com>
Date: Wed, 11 Dec 2019 20:03:40 +0000 (-0600)
Subject: ceph-daemon-adoption-corpus -> cephadm-adoption-corpus
X-Git-Tag: v15.1.0~544^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d120ffcdff48bc15b12800dac094f8711783825c;p=ceph.git

ceph-daemon-adoption-corpus -> cephadm-adoption-corpus

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/.gitmodules b/.gitmodules
index b05261e08733c..f73ae196e1954 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "ceph-daemon-adoption-corpus"]
-	path = ceph-daemon-adoption-corpus
-	url = https://github.com/ceph/ceph-daemon-adoption-corpus.git
+[submodule "cephadm-adoption-corpus"]
+	path = cephadm-adoption-corpus
+	url = https://github.com/ceph/cephadm-adoption-corpus.git
 [submodule "ceph-object-corpus"]
 	path = ceph-object-corpus
 	url = https://github.com/ceph/ceph-object-corpus.git
diff --git a/ceph-daemon-adoption-corpus b/ceph-daemon-adoption-corpus
deleted file mode 160000
index 63c15675e0e16..0000000000000
--- a/ceph-daemon-adoption-corpus
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 63c15675e0e16f559a1ee4ef7db8b58f07c6c126
diff --git a/cephadm-adoption-corpus b/cephadm-adoption-corpus
new file mode 160000
index 0000000000000..63c15675e0e16
--- /dev/null
+++ b/cephadm-adoption-corpus
@@ -0,0 +1 @@
+Subproject commit 63c15675e0e16f559a1ee4ef7db8b58f07c6c126
diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh
index 390dfbd3e2c18..29cf4b278057a 100755
--- a/qa/workunits/cephadm/test_cephadm.sh
+++ b/qa/workunits/cephadm/test_cephadm.sh
@@ -11,7 +11,7 @@ IMAGE_MASTER=${IMAGE_MASTER:-'ceph/daemon-base:latest-master-devel'}
 IMAGE_NAUTILUS=${IMAGE_NAUTILUS:-'ceph/daemon-base:latest-nautilus'}
 IMAGE_MIMIC=${IMAGE_MIMIC:-'ceph/daemon-base:latest-mimic'}
 
-CORPUS_GIT_SUBMOD="ceph-daemon-adoption-corpus"
+CORPUS_GIT_SUBMOD="cephadm-adoption-corpus"
 TMPDIR=$(mktemp -d)
 trap "rm -rf $TMPDIR" EXIT
 git clone https://github.com/ceph/$CORPUS_GIT_SUBMOD $TMPDIR