commit 14eb00e627f9cffc633bdb75f0c50f71a6b6c0b3
author Pavel Cizinsky <pcizinsky@mirantis.com> Fri Nov 09 15:15:07 2018 +0100
committer Pavel Cizinsky <pcizinsky@mirantis.com> Thu Dec 13 17:44:44 2018 +0100
tree 42a0b6b5fcd6e890a488237ad77058d589b0fc07
parent f1c255bbc9d6c1c0419714fe7bc42794b7ecee3f

Refactor tls certs for xmpp

Related: PROD-23929 (PROD:23929)

Change-Id: I5008c93b65fa42c8198e0e064aad4c738305cc44

tests/pillar/control3.sls

diff --git a/tests/pillar/control3.sls b/tests/pillar/control3.sls
index 7492795..dff472e 100644
--- a/tests/pillar/control3.sls
+++ b/tests/pillar/control3.sls
@@ -88,6 +88,14 @@
       id: 2
     - host: 127.0.0.1
       id: 3
+    xmpp:
+      tls:
+        enabled: True
+        auth:
+          enabled: True
+        cert_file: /etc/contrail/server.pem
+        key_file: /etc/contrail/privkey.pem
+        ca_cert_file: /etc/contrail/ca-cert.pem
   database:
     version: 3.0
     cassandra:

tests/pillar/control40.sls

diff --git a/tests/pillar/control40.sls b/tests/pillar/control40.sls
index 5351ef8..f98a28f 100644
--- a/tests/pillar/control40.sls
+++ b/tests/pillar/control40.sls
@@ -98,6 +98,14 @@
       id: 2
     - host: 127.0.0.1
       id: 3
+    xmpp:
+      tls:
+        enabled: True
+        auth:
+          enabled: True
+        cert_file: /etc/contrail/server.pem
+        key_file: /etc/contrail/privkey.pem
+        ca_cert_file: /etc/contrail/ca-cert.pem
   database:
     version: 4.0
     config_only: true

tests/pillar/vrouter3.sls

diff --git a/tests/pillar/vrouter3.sls b/tests/pillar/vrouter3.sls
index 807b510..fbf2550 100644
--- a/tests/pillar/vrouter3.sls
+++ b/tests/pillar/vrouter3.sls
@@ -48,3 +48,11 @@
           user: admin
           password: "supersecretpassword123"
           tenant: admin
+    xmpp:
+      tls:
+        enabled: True
+        auth:
+          enabled: True
+        cert_file: /etc/contrail/server.pem
+        key_file: /etc/contrail/privkey.pem
+        ca_cert_file: /etc/contrail/ca-cert.pem
\ No newline at end of file

tests/pillar/vrouter40.sls

diff --git a/tests/pillar/vrouter40.sls b/tests/pillar/vrouter40.sls
index 16cdcff..e1ebc84 100644
--- a/tests/pillar/vrouter40.sls
+++ b/tests/pillar/vrouter40.sls
@@ -52,3 +52,11 @@
           user: admin
           password: "supersecretpassword123"
           tenant: admin
+    xmpp:
+      tls:
+        enabled: True
+        auth:
+          enabled: True
+        cert_file: /etc/contrail/server.pem
+        key_file: /etc/contrail/privkey.pem
+        ca_cert_file: /etc/contrail/ca-cert.pem
\ No newline at end of file