summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-12-20 11:52:33 +0000
committerGerrit Code Review <review@openstack.org>2018-12-20 11:52:33 +0000
commit1a658eb18748dedba243d1baa3d759c4ec851818 (patch)
tree030cbd509cdd2b40d730cd334a49a40d43761fb4
parent6299ed5ed001ae2768ed2b954730b526b4053b2c (diff)
parentf096d1145c7b14fae2c666b8d088574e570bffd4 (diff)
Merge "Only run the needed services for CephFS jobs"
-rw-r--r--playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml2
-rw-r--r--playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml2
2 files changed, 4 insertions, 0 deletions
diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml
index bbb0fbf..b3c5826 100644
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml
@@ -102,6 +102,8 @@
102 export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" 102 export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
103 export KEEP_LOCALRC=1 103 export KEEP_LOCALRC=1
104 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" 104 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
105 OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
106 export OVERRIDE_ENABLED_SERVICES
105 107
106 function pre_test_hook { 108 function pre_test_hook {
107 # Configure Manila with a CephFS Native or NFS driver backend. 109 # Configure Manila with a CephFS Native or NFS driver backend.
diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml
index 9d20236..2de9804 100644
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml
@@ -102,6 +102,8 @@
102 export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" 102 export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
103 export KEEP_LOCALRC=1 103 export KEEP_LOCALRC=1
104 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS" 104 export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
105 OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
106 export OVERRIDE_ENABLED_SERVICES
105 107
106 function pre_test_hook { 108 function pre_test_hook {
107 # Configure Manila with a CephFS Native or NFS driver backend. 109 # Configure Manila with a CephFS Native or NFS driver backend.