From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 7 Oct 2017 03:46:44 +0000 (+0000)
Subject: Merge "Update panko port in env ssl yaml files to correct one" into stable/pike
X-Git-Tag: opnfv-6.0.0~84
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7327fe00c4f7fa2aeb20dfb316a4195752baccab;hp=d06549cba49625b994d9513765b11683d5fbccad;p=apex-tripleo-heat-templates.git

Merge "Update panko port in env ssl yaml files to correct one" into stable/pike
---

diff --git a/environments/ssl/tls-endpoints-public-dns.yaml b/environments/ssl/tls-endpoints-public-dns.yaml
index 3b3ddc16..d1bd2d20 100644
--- a/environments/ssl/tls-endpoints-public-dns.yaml
+++ b/environments/ssl/tls-endpoints-public-dns.yaml
@@ -77,9 +77,9 @@ parameter_defaults:
     OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
     OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
     OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
-    PankoAdmin: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
-    PankoInternal: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
-    PankoPublic: {protocol: 'https', port: '13779', host: 'CLOUDNAME'}
+    PankoAdmin: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
+    PankoInternal: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
+    PankoPublic: {protocol: 'https', port: '13977', host: 'CLOUDNAME'}
     SaharaAdmin: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
     SaharaInternal: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
     SaharaPublic: {protocol: 'https', port: '13386', host: 'CLOUDNAME'}
diff --git a/environments/ssl/tls-endpoints-public-ip.yaml b/environments/ssl/tls-endpoints-public-ip.yaml
index bca6a891..b776f648 100644
--- a/environments/ssl/tls-endpoints-public-ip.yaml
+++ b/environments/ssl/tls-endpoints-public-ip.yaml
@@ -77,9 +77,9 @@ parameter_defaults:
     OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
     OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
     OctaviaPublic: {protocol: 'https', port: '13876', host: 'IP_ADDRESS'}
-    PankoAdmin: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
-    PankoInternal: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
-    PankoPublic: {protocol: 'https', port: '13779', host: 'IP_ADDRESS'}
+    PankoAdmin: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
+    PankoInternal: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
+    PankoPublic: {protocol: 'https', port: '13977', host: 'IP_ADDRESS'}
     SaharaAdmin: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
     SaharaInternal: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
     SaharaPublic: {protocol: 'https', port: '13386', host: 'IP_ADDRESS'}
diff --git a/environments/ssl/tls-everywhere-endpoints-dns.yaml b/environments/ssl/tls-everywhere-endpoints-dns.yaml
index e3fe608b..e0cfc9e6 100644
--- a/environments/ssl/tls-everywhere-endpoints-dns.yaml
+++ b/environments/ssl/tls-everywhere-endpoints-dns.yaml
@@ -77,9 +77,9 @@ parameter_defaults:
     OctaviaAdmin: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
     OctaviaInternal: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
     OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
-    PankoAdmin: {protocol: 'https', port: '8779', host: 'CLOUDNAME'}
-    PankoInternal: {protocol: 'https', port: '8779', host: 'CLOUDNAME'}
-    PankoPublic: {protocol: 'https', port: '13779', host: 'CLOUDNAME'}
+    PankoAdmin: {protocol: 'https', port: '8977', host: 'CLOUDNAME'}
+    PankoInternal: {protocol: 'https', port: '8977', host: 'CLOUDNAME'}
+    PankoPublic: {protocol: 'https', port: '13977', host: 'CLOUDNAME'}
     SaharaAdmin: {protocol: 'https', port: '8386', host: 'CLOUDNAME'}
     SaharaInternal: {protocol: 'https', port: '8386', host: 'CLOUDNAME'}
     SaharaPublic: {protocol: 'https', port: '13386', host: 'CLOUDNAME'}
diff --git a/sample-env-generator/ssl.yaml b/sample-env-generator/ssl.yaml
index 43a1afc1..a3b5f24a 100644
--- a/sample-env-generator/ssl.yaml
+++ b/sample-env-generator/ssl.yaml
@@ -172,9 +172,9 @@ environments:
             OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
             OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
             OctaviaPublic: {protocol: 'https', port: '13876', host: 'IP_ADDRESS'}
-            PankoAdmin: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
-            PankoInternal: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
-            PankoPublic: {protocol: 'https', port: '13779', host: 'IP_ADDRESS'}
+            PankoAdmin: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
+            PankoInternal: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
+            PankoPublic: {protocol: 'https', port: '13977', host: 'IP_ADDRESS'}
             SaharaAdmin: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
             SaharaInternal: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
             SaharaPublic: {protocol: 'https', port: '13386', host: 'IP_ADDRESS'}
@@ -273,9 +273,9 @@ environments:
             OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
             OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
             OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
-            PankoAdmin: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
-            PankoInternal: {protocol: 'http', port: '8779', host: 'IP_ADDRESS'}
-            PankoPublic: {protocol: 'https', port: '13779', host: 'CLOUDNAME'}
+            PankoAdmin: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
+            PankoInternal: {protocol: 'http', port: '8977', host: 'IP_ADDRESS'}
+            PankoPublic: {protocol: 'https', port: '13977', host: 'CLOUDNAME'}
             SaharaAdmin: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
             SaharaInternal: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
             SaharaPublic: {protocol: 'https', port: '13386', host: 'CLOUDNAME'}
@@ -374,9 +374,9 @@ environments:
             OctaviaAdmin: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
             OctaviaInternal: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
             OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
-            PankoAdmin: {protocol: 'https', port: '8779', host: 'CLOUDNAME'}
-            PankoInternal: {protocol: 'https', port: '8779', host: 'CLOUDNAME'}
-            PankoPublic: {protocol: 'https', port: '13779', host: 'CLOUDNAME'}
+            PankoAdmin: {protocol: 'https', port: '8977', host: 'CLOUDNAME'}
+            PankoInternal: {protocol: 'https', port: '8977', host: 'CLOUDNAME'}
+            PankoPublic: {protocol: 'https', port: '13977', host: 'CLOUDNAME'}
             SaharaAdmin: {protocol: 'https', port: '8386', host: 'CLOUDNAME'}
             SaharaInternal: {protocol: 'https', port: '8386', host: 'CLOUDNAME'}
             SaharaPublic: {protocol: 'https', port: '13386', host: 'CLOUDNAME'}