commit a5af59b40b965e7fcb94ece589b74faa373e54fa
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Nov 23 17:02:14 2020 +0000
committer Gerrit Code Review <mail@domain.com> Mon Nov 23 17:02:14 2020 +0000
tree e856a2e11c8b97105d0b7fc084de28ed30426a28
parent 1214c463b693c6ec78b90320ec19b77aa9b20e22
parent 3976f5021f445c008c62b7799c9f27561fcfe12a

Merge "Pass in Alerta authentication details for Alertmanager to send alerts with"

fluentd/label/notifications/input_rabbitmq.yml

diff --git a/fluentd/label/notifications/input_rabbitmq.yml b/fluentd/label/notifications/input_rabbitmq.yml
index 3d7edef..06fca7c 100644
--- a/fluentd/label/notifications/input_rabbitmq.yml
+++ b/fluentd/label/notifications/input_rabbitmq.yml
@@ -85,7 +85,7 @@
                 enable_ruby: true
                 record:
                   - name: notification_type
-                    value: '${fluentd:dollar}{ record["payload"]["eventType"] && record["payload"]["eventTime"] ? "audit" : "notification" }'
+                    value: '${fluentd:dollar}{ record["payload"].key?("eventType") && record["payload"].key?("eventTime") ? "audit" : "notification" }'
             match:
               rewrite_message_tag:
                 tag: raw_notifications

horizon/server/iptables.yml

diff --git a/horizon/server/iptables.yml b/horizon/server/iptables.yml
index 4836feb..e25fad8 100644
--- a/horizon/server/iptables.yml
+++ b/horizon/server/iptables.yml
@@ -36,7 +36,7 @@
                   action: REJECT
                 501:
                   # 501-503 disable private networks
-                  rule: --dst 10.0.0.0/16
+                  rule: --dst 10.0.0.0/8
                   action: REJECT
                 502:
                   rule: --dst 172.16.0.0/12

keystone/server/fernet_rotation/cluster.yml

diff --git a/keystone/server/fernet_rotation/cluster.yml b/keystone/server/fernet_rotation/cluster.yml
index 7ae4dfd..4db82cc 100644
--- a/keystone/server/fernet_rotation/cluster.yml
+++ b/keystone/server/fernet_rotation/cluster.yml
@@ -5,8 +5,13 @@
   _param:
     fernet_rotation_driver: 'rsync'
     credential_rotation_driver: 'rsync'
+    openstack_control_node01_hostname: ctl01
   keystone:
     server:
+      initial_data:
+        home_dir: /srv/volumes/backup/backupninja
+        host: ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
+        source: ${_param:infra_kvm_node03_address}
       tokens:
         fernet_sync_nodes_list:
           sync_node01:

keystone/server/fernet_rotation/single.yml

diff --git a/keystone/server/fernet_rotation/single.yml b/keystone/server/fernet_rotation/single.yml
index 3ce6a8d..4bd09e9 100644
--- a/keystone/server/fernet_rotation/single.yml
+++ b/keystone/server/fernet_rotation/single.yml
@@ -3,10 +3,15 @@
 - system.openssh.client.root
 parameters:
   _param:
+    openstack_control_node01_hostname: ctl01
     fernet_rotation_driver: 'rsync'
     credential_rotation_driver: 'rsync'
   keystone:
     server:
+      initial_data:
+        home_dir: /srv/volumes/backup/backupninja
+        host: ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
+        source: ${_param:infra_kvm_node03_address}
       tokens:
         fernet_rotation_driver: ${_param:fernet_rotation_driver}
       credential: