From 5af24aba4c044e7bf475f71bb18244e53aa4335f Mon Sep 17 00:00:00 2001 From: Valeriy Ponomaryov Date: Fri, 4 Nov 2016 14:50:23 +0300 Subject: [PATCH] [Manila] Fix CI job configuration After disabling all OpenStack services [1] for manila/rally CI jobs, we need to remove every usage of context that is related to disabled projects. In current case, creation of Neutron networks became redundant. So, remove it from scenarios. Also, use proper predefined share types for each type of a job. [1] I753a648349f7a3b8ede3ee714657638f4db68ec5 Depends-On: I7278a897bb89f0562e1eda449b725d965cb10566 Change-Id: I160740c7674e6ee79daea6e840acd6e3a47d8a75 --- rally-jobs/rally-manila-no-ss.yaml | 1 + rally-jobs/rally-manila.yaml | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/rally-jobs/rally-manila-no-ss.yaml b/rally-jobs/rally-manila-no-ss.yaml index 4562fecb..a398ec9a 100644 --- a/rally-jobs/rally-manila-no-ss.yaml +++ b/rally-jobs/rally-manila-no-ss.yaml @@ -39,6 +39,7 @@ args: share_proto: "nfs" size: 1 + share_type: "dhss_false" min_sleep: 1 max_sleep: 2 runner: diff --git a/rally-jobs/rally-manila.yaml b/rally-jobs/rally-manila.yaml index 9b5d6c02..66c259a8 100644 --- a/rally-jobs/rally-manila.yaml +++ b/rally-jobs/rally-manila.yaml @@ -40,6 +40,7 @@ args: share_proto: "nfs" size: 1 + share_type: "dhss_true" min_sleep: 1 max_sleep: 2 runner: @@ -56,9 +57,6 @@ tenants: 2 users_per_tenant: 1 user_choice_method: "round_robin" - network: - networks_per_tenant: 2 - start_cidr: "99.0.0.0/24" manila_share_networks: use_share_networks: True sla: