diff options
| author |   Ben Nemec <bnemec@redhat.com> | 2017-05-18 15:38:22 -0500 |
|---|---|---|
| committer | Ben Nemec <bnemec@redhat.com> | 2017-06-12 15:02:50 -0500 |
| commit | 8d086b171099f0a968f1fdd1b39706ec64a52f56 (patch) | |
| tree | 33206165ab8b6d88f367738daae2da4c17266078 /environments/ssl | |
| parent | 7613306b8cb67547cc9f0c56f9ba97a45a9e7f73 (diff) | |
Add storage sample environments
Starts converting storage-related sample environments to the tool,
and adds a few new ones for demonstration purposes.
This has required the addition of a new category of parameter
overrides in the tool. There are some parameters that are part of
the public API of roles that should not normally be included in a
sample environment for that role. Examples are EndpointMap and
ServiceNetMap. Those are both passed into most (all?) roles, but
their template defaults are not useful (both default to {}).
Unless we are explicitly creating a sample environment that
overrides those defaults we don't want them included.
Parameters such as RoleName and RoleParameters are similar. We
can't change them because they are part of the composable roles
interface and that would break any existing custom roles, but we
don't really want them included normally either. It's possible
these could be made completely private, but there have been some
very preliminary discussions about generating role samples that
might actually want to set them.
In order to avoid issues with editing the unit test file in editors
that strip trailing whitespace, the minor formatting bug where
params like EndpointMap had a trailing space after the name has
also been fixed.
Change-Id: If11f30c734bfbc17d463a9890c736d7477186fb9
Diffstat (limited to 'environments/ssl')
| -rw-r--r-- | environments/ssl/tls-endpoints-public-dns.yaml | 2 | ||||
| -rw-r--r-- | environments/ssl/tls-endpoints-public-ip.yaml | 2 | ||||
| -rw-r--r-- | environments/ssl/tls-everywhere-endpoints-dns.yaml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/environments/ssl/tls-endpoints-public-dns.yaml b/environments/ssl/tls-endpoints-public-dns.yaml index d1cab981..216afece 100644 --- a/environments/ssl/tls-endpoints-public-dns.yaml +++ b/environments/ssl/tls-endpoints-public-dns.yaml @@ -11,7 +11,7 @@ parameter_defaults: # Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. # Type: json - EndpointMap: + EndpointMap: AodhAdmin: {protocol: 'http', port: '8042', host: 'IP_ADDRESS'} AodhInternal: {protocol: 'http', port: '8042', host: 'IP_ADDRESS'} AodhPublic: {protocol: 'https', port: '13042', host: 'CLOUDNAME'} diff --git a/environments/ssl/tls-endpoints-public-ip.yaml b/environments/ssl/tls-endpoints-public-ip.yaml index cb41dc12..d216ab7f 100644 --- a/environments/ssl/tls-endpoints-public-ip.yaml +++ b/environments/ssl/tls-endpoints-public-ip.yaml @@ -11,7 +11,7 @@ parameter_defaults: # Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. # Type: json - EndpointMap: + EndpointMap: AodhAdmin: {protocol: 'http', port: '8042', host: 'IP_ADDRESS'} AodhInternal: {protocol: 'http', port: '8042', host: 'IP_ADDRESS'} AodhPublic: {protocol: 'https', port: '13042', host: 'IP_ADDRESS'} diff --git a/environments/ssl/tls-everywhere-endpoints-dns.yaml b/environments/ssl/tls-everywhere-endpoints-dns.yaml index 7ae7f3a0..63157ddd 100644 --- a/environments/ssl/tls-everywhere-endpoints-dns.yaml +++ b/environments/ssl/tls-everywhere-endpoints-dns.yaml @@ -11,7 +11,7 @@ parameter_defaults: # Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. # Type: json - EndpointMap: + EndpointMap: AodhAdmin: {protocol: 'https', port: '8042', host: 'CLOUDNAME'} AodhInternal: {protocol: 'https', port: '8042', host: 'CLOUDNAME'} AodhPublic: {protocol: 'https', port: '13042', host: 'CLOUDNAME'} |