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 <dsavinea@redhat.com>

diff --git a/contrib/push-roles-to-ansible-galaxy.sh b/contrib/push-roles-to-ansible-galaxy.sh
index 294db1dd77c9399530f16a872245a1318e05ec9c..1c6971be8679942a0e30b53e5ab6f1e085515711 100755 (executable)
--- 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 3afbf4b8c78ed1f977add0100434cc9fef980b04..dbfb1688afdeb64a16246c5fb7820fb7fd2ee63e 100644 (file)
--- 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 cea7fe89af075e5b075e4c4594fe000ddc95c481..fe2e314bc54217a11c01908a49c15150dd3ee8f2 100644 (file)
--- 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 8302bc6c9be38c59c26500451841d7e63b010f73..f5d63d592b61e20be55407d36f94766bb3d66304 100644 (file)
--- 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 3664417830d34c7e19a610ee58485aa77c84bf13..c9963394ee8dfc1a906ba1b689c878892f883bf5 100644 (file)
--- 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 74bb8616a4ee9062c9833798b982cf647d628e25..9f2b5edb27eeae25b3e3d50ec4932ac303037d44 100644 (file)
--- 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 4df53cceaf8832173cc2334fb51bec403c270a7f..b58593cbe76f2d7d9278c5d12cb5924e2c613719 100644 (file)
--- 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