Merge "Enable proxy parsing in Gnocchi"
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/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}