aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2020-01-27 12:28:59 +0100
committerMichal Nasiadka <mnasiadka@gmail.com>2020-02-11 11:42:06 +0100
commit4e6fe7a6da4d5471cd0425c781f25f3e9567d3a0 (patch)
treec1f1ee41544ee3dd20807aeb76158919d343a723 /tools
parent42000897166fdd2c4c1abfc784fdc21e04bf575f (diff)
downloadkolla-ansible-4e6fe7a6da4d5471cd0425c781f25f3e9567d3a0.tar.gz
kolla-ansible-4e6fe7a6da4d5471cd0425c781f25f3e9567d3a0.zip
Remove kolla-ceph
Kolla-Ansible Ceph deployment mechanism has been deprecated in Train [1]. This change removes the Ansible code and associated CI jobs. [1]: https://review.opendev.org/669214 Change-Id: Ie2167f02ad2f525d3b0f553e2c047516acf55bc2
Diffstat (limited to 'tools')
-rwxr-xr-xtools/cleanup-host8
-rwxr-xr-xtools/setup_gate.sh4
-rwxr-xr-xtools/validate-all-file.py3
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')