Fix sample env data

I934561612d26befd88a9053262836b47bdf4efb0 renamed the rabbit ssl
parameters that we use in the same environment generate but since the
script did not fail, it made it past CI. This change fixes the
RabbitClientUseSsl parameter in the environment to match the new
RpcUseSsl flag and updates the check script to fail if this happens
again.

Change-Id: I47c63875c6934bca2903883787467fc1804ba5da
Closes-Bug: #1768358
This commit is contained in:
Alex Schultz 2018-05-01 16:05:02 -06:00
parent 7952d2e53a
commit 03c8cbcdc2
3 changed files with 6 additions and 5 deletions

View File

@ -17,9 +17,9 @@ parameter_defaults:
# Type: boolean
EnableInternalTLS: True
# Rabbit client subscriber parameter to specify an SSL connection to the RabbitMQ host.
# Messaging client subscriber parameter to specify an SSL connection to the messaging host.
# Type: string
RabbitClientUseSSL: True
RpcUseSSL: True
# Extra properties or metadata passed to Nova for the created nodes in the overcloud. It's accessible via the Nova metadata API.
# Type: json

View File

@ -34,17 +34,17 @@ environments:
- EnableInternalTLS
puppet/services/nova-base.yaml:
parameters:
- RabbitClientUseSSL
- RpcUseSSL
overcloud.yaml:
parameters:
- ServerMetadata
static:
- EnableInternalTLS
- RabbitClientUseSSL
- RpcUseSSL
- ServerMetadata
sample_values:
EnableInternalTLS: True
RabbitClientUseSSL: True
RpcUseSSL: True
ServerMetadata: |-2
ipa_enroll: True

View File

@ -1,4 +1,5 @@
#!/bin/bash
set -e
# Report an error if the generated sample environments are not in sync with
# the current configuration and templates.