From 6c92c5195e426308c7d2d153f7ac809c627712fd Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Thu, 11 Apr 2019 13:52:07 -0700 Subject: [PATCH] Fix ssl.yaml generating GaneshaInternal in the endpoint map The GaneshaInternal configured in the endpoint map is used by the Ganesha service that front-ends CephFS with Manila. It cannot be a hostname, it must be an IP Address always. See [1] Closes-Bug: #1824421 [1] https://github.com/nfs-ganesha/nfs-ganesha/blob/af26bf4/src/config_samples/config.txt#L43 Change-Id: I9eefa5f145ab5b17a4d93e96f4aad35d3e069382 (cherry picked from commit 7910cf3b487ba52e99bacfec4ecc86b1eeac4d16) (cherry picked from commit b74dad7a8544d9bfa23d1f105715906464eb32a0) --- environments/ssl/tls-everywhere-endpoints-dns.yaml | 2 +- sample-env-generator/ssl.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/ssl/tls-everywhere-endpoints-dns.yaml b/environments/ssl/tls-everywhere-endpoints-dns.yaml index 8d7daa3b50..3d56a8dbbf 100644 --- a/environments/ssl/tls-everywhere-endpoints-dns.yaml +++ b/environments/ssl/tls-everywhere-endpoints-dns.yaml @@ -34,7 +34,7 @@ parameter_defaults: Ec2ApiAdmin: {protocol: 'https', port: '8788', host: 'CLOUDNAME'} Ec2ApiInternal: {protocol: 'https', port: '8788', host: 'CLOUDNAME'} Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'CLOUDNAME'} - GaneshaInternal: {protocol: 'nfs', port: '2049', host: 'CLOUDNAME'} + GaneshaInternal: {protocol: 'nfs', port: '2049', host: 'IP_ADDRESS'} GlanceAdmin: {protocol: 'https', port: '9292', host: 'CLOUDNAME'} GlanceInternal: {protocol: 'https', port: '9292', host: 'CLOUDNAME'} GlancePublic: {protocol: 'https', port: '13292', host: 'CLOUDNAME'} diff --git a/sample-env-generator/ssl.yaml b/sample-env-generator/ssl.yaml index 945f67b421..2870ae3218 100644 --- a/sample-env-generator/ssl.yaml +++ b/sample-env-generator/ssl.yaml @@ -381,7 +381,7 @@ environments: Ec2ApiAdmin: {protocol: 'https', port: '8788', host: 'CLOUDNAME'} Ec2ApiInternal: {protocol: 'https', port: '8788', host: 'CLOUDNAME'} Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'CLOUDNAME'} - GaneshaInternal: {protocol: 'nfs', port: '2049', host: 'CLOUDNAME'} + GaneshaInternal: {protocol: 'nfs', port: '2049', host: 'IP_ADDRESS'} GlanceAdmin: {protocol: 'https', port: '9292', host: 'CLOUDNAME'} GlanceInternal: {protocol: 'https', port: '9292', host: 'CLOUDNAME'} GlancePublic: {protocol: 'https', port: '13292', host: 'CLOUDNAME'}