Merge "Remove kolla-ceph"

3 files changed, 1 insertions, 14 deletions

diff --git a/tools/cleanup-host b/tools/cleanup-host
index cc885558c..dfffa6157 100755
--- a/tools/cleanup-host
+++ b/tools/cleanup-host
@@ -37,14 +37,6 @@ fi
 echo "Creating a fstab backup..."
 sudo cp /etc/fstab /etc/fstab_backup
 
-echo "Unmounting Ceph OSD disks"
-for mount in $(mount | awk '/\/var\/lib\/ceph/ { print $3 }'); do
-    umount $mount
-done
-
-echo "Removing ceph references from fstab..."
-sudo sed -i '/\/var\/lib\/ceph\/osd\//d' /etc/fstab
-
 if [[ "$enable_swift" == "yes" ]]; then
     echo "Removing swift references from fstab..."
     cat /etc/fstab | grep "/srv/node/d*" | xargs umount
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index 36e768cae..d30d829ea 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -35,10 +35,6 @@ function setup_config {
         GATE_IMAGES="bifrost"
     fi
 
-    if [[ $SCENARIO == "ceph" ]]; then
-        GATE_IMAGES+=",^ceph,^cinder"
-    fi
-
     if [[ $SCENARIO == "ceph-ansible" ]]; then
         GATE_IMAGES+=",^cinder"
     fi
diff --git a/tools/validate-all-file.py b/tools/validate-all-file.py
index 6acbc08a7..21e5bef84 100755
--- a/tools/validate-all-file.py
+++ b/tools/validate-all-file.py
@@ -150,8 +150,7 @@ def check_docker_become():
                           for x in YAML_INCLUDE_PATTERNS])
     excludes = r'|'.join([fnmatch.translate(x)
                           for x in YAML_EXCLUDE_PATTERNS])
-    docker_modules = ('kolla_docker', 'kolla_ceph_keyring',
-                      'kolla_container_facts', 'kolla_toolbox')
+    docker_modules = ('kolla_docker', 'kolla_container_facts', 'kolla_toolbox')
     cmd_modules = ('command', 'shell')
     return_code = 0
     roles_path = os.path.join(PROJECT_ROOT, 'ansible', 'roles')