Merge "Change PUB key for psvimbersky"
diff --git a/horizon/server/cluster.yml b/horizon/server/cluster.yml
index 837d9b5..c788c92 100644
--- a/horizon/server/cluster.yml
+++ b/horizon/server/cluster.yml
@@ -15,6 +15,8 @@
branding: ${_param:horizon_site_branding}
bind:
port: 8078
+ cache:
+ backend: 'django.core.cache.backends.memcached.MemcachedCache'
plugin: {}
session:
engine: "cache"
diff --git a/horizon/server/single.yml b/horizon/server/single.yml
index 79783cc..92066b9 100644
--- a/horizon/server/single.yml
+++ b/horizon/server/single.yml
@@ -14,6 +14,8 @@
bind:
address: ${_param:horizon_server_bind_address}
port: 8078
+ cache:
+ backend: 'django.core.cache.backends.memcached.MemcachedCache'
plugin: {}
session:
engine: "cache"
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index 18aa37e..5bdedf4 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -141,6 +141,7 @@
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.lang.String int
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.util.Collection java.lang.String
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.util.List groovy.lang.Range
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.util.List java.util.Collection
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.util.regex.Matcher java.util.Collection
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getBytes java.io.File
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getText java.io.InputStream
@@ -152,6 +153,7 @@
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods iterator java.lang.Object[]
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods leftShift java.lang.StringBuffer java.lang.Object
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods minus java.lang.String java.lang.Object
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods minus java.util.List java.util.Collection
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods multiply java.lang.String java.lang.Number
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods plus java.util.List java.lang.Iterable
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods plus java.util.List java.lang.Object
diff --git a/jenkins/client/job/deploy/update/update_opencontrail4.yml b/jenkins/client/job/deploy/update/update_opencontrail4.yml
index 98110cb..3487ef4 100644
--- a/jenkins/client/job/deploy/update/update_opencontrail4.yml
+++ b/jenkins/client/job/deploy/update/update_opencontrail4.yml
@@ -43,3 +43,6 @@
type: string
default: '1'
description: Number of selected nodes to live apply compute update.
+ ASK_CONFIRMATION:
+ type: boolean
+ default: 'true'
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 650962a..a59fe91 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -471,6 +471,10 @@
type: string
default: "salt"
description: Credentials to the Salt API.
+ SLAVE_NODE:
+ type: string
+ default: "slave01"
+ description: Label or name of node to start the Shaker server (should be one of cicd nodes and should have the IP address of SHAKER_SERVER_ENDPOINT).
SHAKER_PARAMS:
type: text
default: |
@@ -492,8 +496,8 @@
# - SHAKER_EXTERNAL_NET='public'
description: |
YAML context with parameters for running Shaker tests, where
- "SHAKER_SERVER_ENDPOINT" - Address for Shaker server connections (host:port). Should be accessible
- from tenant's VM network (usually equals to public address of cicd node)
+ "SHAKER_SERVER_ENDPOINT" - Address for Shaker server connections (host:port). The IP address of SLAVE_NODE with the port. Should be accessible
+ from tenant's VM network (floating network)
"SHAKER_SCENARIOS" - Path to shaker scenarios in the cvp-shaker docker image
(can be directory or specific file). Main categories are
scenarios/essential/l2