Merge "Remove hostname field as Hostname is preferred"
diff --git a/.releasenotes/notes/smtp_tls-907be4451c86b669.yaml b/.releasenotes/notes/smtp_tls-907be4451c86b669.yaml
new file mode 100644
index 0000000..3e79c8f
--- /dev/null
+++ b/.releasenotes/notes/smtp_tls-907be4451c86b669.yaml
@@ -0,0 +1,18 @@
+---
+summary: >
+ Additional option for push notification service to work with SMTP server
+
+features:
+ - Earlier the push notification service considered SMTP server working only under TLS.
+ In case of custom SMPT servers which use non-TLS connection the push notification service is
+ not working properly. This patch added the explicit definition of TLS using.
+ To define this parameter you need to set 'pushkin_smtp_use_tls' variable on cluster level metadata.
+
+ Example:
+ .. code-block:: yaml
+ parameters:
+ _param:
+ pushkin_smtp_use_tls: true
+
+fixes:
+ - related US: https://mirantis.jira.com/browse/PROD-14976
diff --git a/docker/swarm/stack/pushkin.yml b/docker/swarm/stack/pushkin.yml
index 22a921d..55f1fd6 100644
--- a/docker/swarm/stack/pushkin.yml
+++ b/docker/swarm/stack/pushkin.yml
@@ -11,6 +11,7 @@
pushkin_db_host: ${_param:haproxy_postgresql_bind_host}
pushkin_smtp_host: smtp.gmail.com
pushkin_smtp_port: 587
+ pushkin_smtp_use_tls: true
webhook_from: your_sender@mail.com
pushkin_email_sender_password: your_sender_password
webhook_recipients: "recepient1@mail.com,recepient2@mail.com"
@@ -38,6 +39,7 @@
EMAIL_SENDER_PASSWORD: ${_param:pushkin_email_sender_password}
SMTP_HOST: ${_param:pushkin_smtp_host}
SMTP_PORT: ${_param:pushkin_smtp_port}
+ SMTP_USE_TLS: ${_param:pushkin_smtp_use_tls}
WEBHOOK_RECIPIENTS: ${_param:webhook_recipients}
WEBHOOK_LOGIN_ID: ${_param:webhook_login_id}
WEBHOOK_APPLICATION_ID: ${_param:webhook_application_id}
diff --git a/glusterfs/client/volume/gnocchi.yml b/glusterfs/client/volume/gnocchi.yml
new file mode 100644
index 0000000..f6c3351
--- /dev/null
+++ b/glusterfs/client/volume/gnocchi.yml
@@ -0,0 +1,32 @@
+parameters:
+ _param:
+ gnocchi_glusterfs_service_host: ${_param:glusterfs_service_host}
+ glusterfs_node01_address: ${_param:cluster_node01_address}
+ glusterfs_node02_address: ${_param:cluster_node02_address}
+ glusterfs_node03_address: ${_param:cluster_node03_address}
+ glusterfs:
+ client:
+ volumes:
+ gnocchi:
+ path: /var/lib/gnocchi/
+ server: ${_param:gnocchi_glusterfs_service_host}
+ user: gnocchi
+ group: gnocchi
+ opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
+ linux:
+ system:
+ user:
+ gnocchi:
+ enabled: true
+ name: gnocchi
+ uid: 305
+ gid: 305
+ home: /var/lib/gnocchi
+ shell: /bin/false
+ system: True
+ group:
+ gnocchi:
+ enabled: true
+ name: gnocchi
+ gid: 305
+ system: True
diff --git a/glusterfs/server/volume/gnocchi.yml b/glusterfs/server/volume/gnocchi.yml
new file mode 100644
index 0000000..f8f5b6a
--- /dev/null
+++ b/glusterfs/server/volume/gnocchi.yml
@@ -0,0 +1,18 @@
+parameters:
+ glusterfs:
+ server:
+ volumes:
+ gnocchi:
+ storage: /srv/glusterfs/gnocchi
+ replica: 3
+ bricks:
+ - ${_param:cluster_node01_address}:/srv/glusterfs/gnocchi
+ - ${_param:cluster_node02_address}:/srv/glusterfs/gnocchi
+ - ${_param:cluster_node03_address}:/srv/glusterfs/gnocchi
+ options:
+ cluster.readdir-optimize: On
+ nfs.disable: On
+ network.remote-dio: On
+ diagnostics.client-log-level: WARNING
+ diagnostics.brick-log-level: WARNING
+ cluster.favorite-child-policy: mtime
diff --git a/gnocchi/server/cluster.yml b/gnocchi/server/cluster.yml
index e5a4650..bbae551 100644
--- a/gnocchi/server/cluster.yml
+++ b/gnocchi/server/cluster.yml
@@ -4,3 +4,7 @@
- system.apache.server.site.gnocchi
- system.haproxy.proxy.listen.openstack.gnocchi
- system.keepalived.cluster.instance.openstack_telemetry_vip
+parameters:
+ gnocchi:
+ server:
+ enable_proxy_headers_parsing: true
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/manila/control/cluster.yml b/manila/control/cluster.yml
new file mode 100644
index 0000000..0bf4c69
--- /dev/null
+++ b/manila/control/cluster.yml
@@ -0,0 +1,13 @@
+classes:
+ - system.manila.common.cluster
+ - system.apache.server.site.manila
+ - system.haproxy.proxy.listen.openstack.manila
+parameters:
+ manila:
+ common:
+ dhss: false
+ version: ${_param:openstack_version}
+ api:
+ enabled: true
+ scheduler:
+ enabled: true
diff --git a/manila/control/single.yml b/manila/control/single.yml
new file mode 100644
index 0000000..5029c67
--- /dev/null
+++ b/manila/control/single.yml
@@ -0,0 +1,12 @@
+classes:
+ - system.manila.common.cluster
+ - system.apache.server.site.manila
+parameters:
+ manila:
+ common:
+ dhss: false
+ version: ${_param:openstack_version}
+ api:
+ enabled: true
+ scheduler:
+ enabled: true
diff --git a/reclass/storage/system/openstack_share_multi.yml b/reclass/storage/system/openstack_share_multi.yml
new file mode 100644
index 0000000..a347aec
--- /dev/null
+++ b/reclass/storage/system/openstack_share_multi.yml
@@ -0,0 +1,42 @@
+parameters:
+ _param:
+ openstack_share_node01_hostname: share01
+ openstack_share_node02_hostname: share02
+ openstack_share_node03_hostname: share03
+
+ openstack_share_node01_share_address: ${_param:single_address}
+ openstack_share_node02_share_address: ${_param:single_address}
+ openstack_share_node03_share_address: ${_param:single_address}
+ reclass:
+ storage:
+ node:
+ openstack_share_node01:
+ name: ${_param:openstack_share_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.share
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:linux_system_codename}
+ single_address: ${_param:openstack_share_node01_address}
+ share_address: ${_param:openstack_share_node01_share_address}
+ openstack_share_node02:
+ name: ${_param:openstack_share_node02_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.share
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:linux_system_codename}
+ single_address: ${_param:openstack_share_node02_address}
+ share_address: ${_param:openstack_share_node02_share_address}
+ openstack_share_node03:
+ name: ${_param:openstack_share_node03_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.share
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:linux_system_codename}
+ single_address: ${_param:openstack_share_node03_address}
+ share_address: ${_param:openstack_share_node03_share_address}
diff --git a/reclass/storage/system/openstack_share_single.yml b/reclass/storage/system/openstack_share_single.yml
new file mode 100644
index 0000000..cb33dde
--- /dev/null
+++ b/reclass/storage/system/openstack_share_single.yml
@@ -0,0 +1,16 @@
+parameters:
+ _param:
+ openstack_share_node01_hostname: share01
+ reclass:
+ storage:
+ node:
+ openstack_share_node01:
+ name: ${_param:openstack_share_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.share
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:linux_system_codename}
+ single_address: ${_param:openstack_share_node01_address}
+ share_address: ${_param:openstack_share_node01_share_address}
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