Merge "Add panko and gnocchi to default openstack formulas"
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index a020a73..819b703 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -206,12 +206,12 @@
description: e.g. skipped_nodes=nal01.local.com,ntw01.local.com
TESTS_SET:
type: string
- default: "cvp-sanity-check/cvp_checks/tests/"
- description: Leave empty for full run or choose a file, e.g. test_mtu.py
+ default: "cvp-sanity-checks/cvp_checks/tests/"
+ description: "Leave as is for full run or add a filename, e.g. <default path>/test_mtu.py"
PROXY:
type: string
default: ""
- description: Proxy address to clone repo and install python requirements
+ description: "Proxy address to use to access the Internet. For offline mode, use \"offline\" value."
cvp-func:
type: workflow-scm
name: cvp-func
@@ -246,7 +246,7 @@
description: Credentials to the Salt API
TEST_IMAGE:
type: string
- default: "xrally/xrally-openstack:0.9.1"
+ default: "xrally/xrally-openstack:0.9.2"
description: Docker image to use for running Rally/Tempest
TARGET_NODE:
type: string
@@ -255,7 +255,7 @@
PROXY:
type: string
default: ""
- description: Proxy address to clone repo and install python requirements
+ description: "Proxy address to use to access the Internet. For offline mode, use \"offline\" value."
TEMPEST_TEST_PATTERN:
type: string
default: "set=smoke"
@@ -309,7 +309,7 @@
description: Node where container with tempest will be run
TEST_IMAGE:
type: string
- default: "xrally/xrally-openstack:0.9.1"
+ default: "xrally/xrally-openstack:0.9.2"
description: Docker image to use for running Rally/Tempest
TARGET_NODES:
type: string
@@ -330,7 +330,7 @@
PROXY:
type: string
default: ""
- description: Proxy address to clone repo and install python requirements
+ description: "Proxy address to use to access the Internet. For offline mode, use \"offline\" value."
TEMPEST_TEST_PATTERN:
type: string
default: "set=smoke"
@@ -373,7 +373,7 @@
description: Path to scenario file in container
TEST_IMAGE:
type: string
- default: "xrally/xrally-openstack:0.9.1"
+ default: "xrally/xrally-openstack:0.9.2"
description: Docker image to use for running Rally/Tempest
SALT_MASTER_URL:
type: string
@@ -390,9 +390,11 @@
TOOLS_REPO:
type: string
default: "https://github.com/Mirantis/cvp-configuration"
+ description: URL of repo where testing tools, scenarios, configs are located.
PROXY:
type: string
default: ""
+ description: "Proxy address to use to access the Internet. For offline mode, use \"offline\" value."
cvp-stacklight:
type: workflow-scm
name: cvp-stacklight
@@ -419,7 +421,7 @@
default: "salt"
TESTS_REPO:
type: string
- default: "https://github.com/legan4ik/stacklight-pytest"
+ default: "https://github.com/Mirantis/stacklight-pytest -b cvp_stacklight"
description: Url for cvp-stacklight-tests
TESTS_SETTINGS:
type: string
@@ -428,11 +430,11 @@
TESTS_SET:
type: string
default: "stacklight-pytest/stacklight_tests/tests/prometheus/"
- description: "Leave empty for full run or choose a file, e.g. test_dashboards.py"
+ description: "Leave as is for full run or add a filename, e.g. <default path>/test_dashboards.py"
PROXY:
type: string
default: ""
- description: Proxy address to clone repo and install python requirements
+ description: "Proxy address to use to access the Internet. For offline mode, use \"offline\" value."
cvp-spt:
type: workflow-scm
name: cvp-spt
@@ -468,8 +470,8 @@
TESTS_SET:
type: string
default: "cvp-spt/cvp_spt/tests/"
- description: "Leave empty for full run or choose a file, e.g. test_glance.py"
+ description: "Leave as is for full run or add a filename, e.g. <default path>/test_glance.py"
PROXY:
type: string
default: ""
- description: Proxy address to clone repo and install python requirements
+ description: "Proxy address to use to access the Internet. For offline mode, use \"offline\" value."
diff --git a/keystone/server/fernet_rotation/cluster.yml b/keystone/server/fernet_rotation/cluster.yml
new file mode 100644
index 0000000..e09b8e9
--- /dev/null
+++ b/keystone/server/fernet_rotation/cluster.yml
@@ -0,0 +1,20 @@
+parameters:
+ keystone:
+ server:
+ tokens:
+ fernet_sync_nodes_list:
+ sync_node01:
+ name: ${_param:openstack_control_node02_hostname}
+ enabled: True
+ sync_node02:
+ name: ${_param:openstack_control_node03_hostname}
+ enabled: True
+ fernet_rotation_driver: rsync
+ linux:
+ system:
+ job:
+ keystone_fernet_rotate_rsync:
+ command: '/var/lib/keystone/fernet_keys_rotate.sh -rs >> /var/log/keystone/fernet_rotate.log 2>> /var/log/keystone/fernet_rotate.log'
+ enabled: true
+ user: keystone
+ minute: 0
diff --git a/keystone/server/fernet_rotation/single.yml b/keystone/server/fernet_rotation/single.yml
new file mode 100644
index 0000000..3aa2add
--- /dev/null
+++ b/keystone/server/fernet_rotation/single.yml
@@ -0,0 +1,13 @@
+parameters:
+ keystone:
+ server:
+ tokens:
+ fernet_rotation_driver: rsync
+ linux:
+ system:
+ job:
+ keystone_fernet_rotate_rsync:
+ command: '/var/lib/keystone/fernet_keys_rotate.sh -r >> /var/log/keystone/fernet_rotate.log 2>> /var/log/keystone/fernet_rotate.log'
+ enabled: true
+ user: keystone
+ minute: 0