From aa197f77fc3eba9054ccdf114f0f08537f1a7c57 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Mon, 17 Jun 2019 15:02:25 -0400 Subject: [PATCH] remove ceph restapi references The ceph restapi configuration was only available until Luminous release so we don't need those leftovers for nautilus+. Signed-off-by: Dimitri Savineau (cherry picked from commit da8b7ab7fb8f9a7ff8346585bd7ffa137bcb6ba0) --- contrib/push-roles-to-ansible-galaxy.sh | 2 +- infrastructure-playbooks/gather-ceph-logs.yml | 1 - .../lvm-auto-discovery/container/vagrant_variables.yml | 3 --- tests/functional/lvm-batch/container/vagrant_variables.yml | 3 --- tests/functional/lvm-osds/container/vagrant_variables.yml | 3 --- .../rgw-multisite/container/secondary/vagrant_variables.yml | 3 --- tests/functional/rgw-multisite/container/vagrant_variables.yml | 3 --- 7 files changed, 1 insertion(+), 17 deletions(-) diff --git a/contrib/push-roles-to-ansible-galaxy.sh b/contrib/push-roles-to-ansible-galaxy.sh index 294db1dd7..1c6971be8 100755 --- a/contrib/push-roles-to-ansible-galaxy.sh +++ b/contrib/push-roles-to-ansible-galaxy.sh @@ -4,7 +4,7 @@ set -xe # VARIABLES BASEDIR=$(dirname "$0") LOCAL_BRANCH=$(cd $BASEDIR && git rev-parse --abbrev-ref HEAD) -ROLES="ceph-common ceph-mon ceph-osd ceph-mds ceph-rgw ceph-restapi ceph-fetch-keys ceph-rbd-mirror ceph-client ceph-container-common ceph-mgr ceph-defaults ceph-config" +ROLES="ceph-common ceph-mon ceph-osd ceph-mds ceph-rgw ceph-fetch-keys ceph-rbd-mirror ceph-client ceph-container-common ceph-mgr ceph-defaults ceph-config" # FUNCTIONS diff --git a/infrastructure-playbooks/gather-ceph-logs.yml b/infrastructure-playbooks/gather-ceph-logs.yml index 3afbf4b8c..dbfb1688a 100644 --- a/infrastructure-playbooks/gather-ceph-logs.yml +++ b/infrastructure-playbooks/gather-ceph-logs.yml @@ -4,7 +4,6 @@ - mdss - rgws - nfss - - restapis - rbdmirrors - clients - mgrs diff --git a/tests/functional/lvm-auto-discovery/container/vagrant_variables.yml b/tests/functional/lvm-auto-discovery/container/vagrant_variables.yml index cea7fe89a..fe2e314bc 100644 --- a/tests/functional/lvm-auto-discovery/container/vagrant_variables.yml +++ b/tests/functional/lvm-auto-discovery/container/vagrant_variables.yml @@ -15,9 +15,6 @@ client_vms: 0 iscsi_gw_vms: 0 mgr_vms: 0 -# Deploy RESTAPI on each of the Monitors -restapi: true - # INSTALL SOURCE OF CEPH # valid values are 'stable' and 'dev' ceph_install_source: stable diff --git a/tests/functional/lvm-batch/container/vagrant_variables.yml b/tests/functional/lvm-batch/container/vagrant_variables.yml index 8302bc6c9..f5d63d592 100644 --- a/tests/functional/lvm-batch/container/vagrant_variables.yml +++ b/tests/functional/lvm-batch/container/vagrant_variables.yml @@ -15,9 +15,6 @@ client_vms: 0 iscsi_gw_vms: 0 mgr_vms: 0 -# Deploy RESTAPI on each of the Monitors -restapi: true - # INSTALL SOURCE OF CEPH # valid values are 'stable' and 'dev' ceph_install_source: stable diff --git a/tests/functional/lvm-osds/container/vagrant_variables.yml b/tests/functional/lvm-osds/container/vagrant_variables.yml index 366441783..c9963394e 100644 --- a/tests/functional/lvm-osds/container/vagrant_variables.yml +++ b/tests/functional/lvm-osds/container/vagrant_variables.yml @@ -15,9 +15,6 @@ client_vms: 0 iscsi_gw_vms: 0 mgr_vms: 0 -# Deploy RESTAPI on each of the Monitors -restapi: true - # INSTALL SOURCE OF CEPH # valid values are 'stable' and 'dev' ceph_install_source: stable diff --git a/tests/functional/rgw-multisite/container/secondary/vagrant_variables.yml b/tests/functional/rgw-multisite/container/secondary/vagrant_variables.yml index 74bb8616a..9f2b5edb2 100644 --- a/tests/functional/rgw-multisite/container/secondary/vagrant_variables.yml +++ b/tests/functional/rgw-multisite/container/secondary/vagrant_variables.yml @@ -14,9 +14,6 @@ client_vms: 0 iscsi_gw_vms: 0 mgr_vms: 0 -# Deploy RESTAPI on each of the Monitors -restapi: true - # INSTALL SOURCE OF CEPH # valid values are 'stable' and 'dev' ceph_install_source: stable diff --git a/tests/functional/rgw-multisite/container/vagrant_variables.yml b/tests/functional/rgw-multisite/container/vagrant_variables.yml index 4df53ccea..b58593cbe 100644 --- a/tests/functional/rgw-multisite/container/vagrant_variables.yml +++ b/tests/functional/rgw-multisite/container/vagrant_variables.yml @@ -15,9 +15,6 @@ client_vms: 0 iscsi_gw_vms: 0 mgr_vms: 0 -# Deploy RESTAPI on each of the Monitors -restapi: true - # INSTALL SOURCE OF CEPH # valid values are 'stable' and 'dev' ceph_install_source: stable