Merge "Add centralized manila control classes"
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index a678966..8bb7c79 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -5,9 +5,6 @@
build-debian-salt-formula:
name: build-debian-salt-formula-{{name}}-ubuntu-{{dist}}
jobs:
- - name: aide
- upload_source_package: false
- dist: trusty
- name: aodh
upload_source_package: false
dist: trusty
@@ -23,9 +20,6 @@
- name: artifactory
upload_source_package: false
dist: trusty
- - name: auditd
- upload_source_package: false
- dist: trusty
- name: avinetworks
upload_source_package: false
dist: trusty
@@ -338,9 +332,6 @@
- name: zookeeper
upload_source_package: false
dist: trusty
- - name: aide
- upload_source_package: true
- dist: xenial
- name: aodh
upload_source_package: true
dist: xenial
@@ -356,9 +347,6 @@
- name: artifactory
upload_source_package: true
dist: xenial
- - name: auditd
- upload_source_package: true
- dist: xenial
- name: avinetworks
upload_source_package: true
dist: xenial
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 4cf664f..3000d71 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -368,11 +368,11 @@
TEST_TEMPEST_IMAGE:
type: string
description: Url to tempest docker image
- default: 'docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest'
+ default: "{{test_image}}"
TEST_IMAGE:
type: string
description: Url to tempest docker image
- default: 'docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest'
+ default: "{{test_image}}"
LOCAL_TEMPEST_IMAGE:
type: string
description: Path to local docker image
@@ -472,8 +472,7 @@
TEST_SUITE:
type: string
description: Testrail test suite
- default: >-
- 'Tempest 16.0.0 with designate tests'
+ default: "{{test_suite}}"
TEST_PLAN:
type: string
description: Testrail test plan
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index bbb7209..a23f4d0 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -7,9 +7,6 @@
git-mirror-2way-salt-formula:
name: git-mirror-2way-salt-formula-{{name}}
jobs:
- - name: aide
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- name: aodh
branches: ${_param:salt_formulas_branches}
notification_recipients: ${_param:salt_formulas_notification_recipients}
@@ -25,9 +22,6 @@
- name: artifactory
branches: ${_param:salt_formulas_branches}
notification_recipients: ${_param:salt_formulas_notification_recipients}
- - name: auditd
- branches: ${_param:salt_formulas_branches}
- notification_recipients: ${_param:salt_formulas_notification_recipients}
- name: avinetworks
branches: ${_param:salt_formulas_branches}
notification_recipients: ${_param:salt_formulas_notification_recipients}
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 501dd38..73d9083 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -5,13 +5,11 @@
test-salt-formula:
name: test-salt-formula-{{name}}-latest
jobs:
- - name: aide
- name: aodh
- name: apache
- name: aptcacher
- name: aptly
- name: artifactory
- - name: auditd
- name: avinetworks
- name: backupninja
- name: barbican
diff --git a/salt/master/formula/git/gnocchi.yml b/salt/master/formula/git/gnocchi.yml
new file mode 100644
index 0000000..53d2f56
--- /dev/null
+++ b/salt/master/formula/git/gnocchi.yml
@@ -0,0 +1,10 @@
+parameters:
+ salt:
+ master:
+ environment:
+ dev:
+ formula:
+ gnocchi:
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-gnocchi.git'
+ revision: ${_param:salt_master_environment_revision}
diff --git a/salt/master/formula/pkg/gnocchi.yml b/salt/master/formula/pkg/gnocchi.yml
new file mode 100644
index 0000000..2f49b99
--- /dev/null
+++ b/salt/master/formula/pkg/gnocchi.yml
@@ -0,0 +1,9 @@
+parameters:
+ salt:
+ master:
+ environment:
+ prd:
+ formula:
+ gnocchi:
+ source: pkg
+ name: salt-formula-gnocchi
diff --git a/salt/master/single.yml b/salt/master/single.yml
index 9764a97..fbb32f2 100644
--- a/salt/master/single.yml
+++ b/salt/master/single.yml
@@ -13,7 +13,8 @@
master:
accept_policy: auto_accept
worker_threads: 40
+ max_open_files: 15000
command_timeout: 10
peer:
'.*':
- - x509.sign_remote_certificate
+ - x509.sign_remote_certificate
\ No newline at end of file
diff --git a/salt/minion/single.yml b/salt/minion/single.yml
new file mode 100644
index 0000000..9d20aff
--- /dev/null
+++ b/salt/minion/single.yml
@@ -0,0 +1,10 @@
+parameters:
+ salt:
+ minion:
+ acceptance_wait_time_max: 60
+ acceptance_wait_time: 10
+ random_reauth_delay: 270
+ recon_default: 1000
+ recon_max: 60000
+ recon_randomize: True
+ auth_timeout: 60
\ No newline at end of file