Skip to content

Commit d9bcc96

Browse files
authored
added staging cert parameter (#114)
1 parent 6b4a138 commit d9bcc96

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

bastion-template.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,11 @@ parameters:
8181
default: 3.7
8282
get_certificates:
8383
type: boolean
84-
description: download certificates with certbot during install
84+
description: download certificates with acme script during install
85+
default: false
86+
staging_certs:
87+
type: boolean
88+
description: use production or staging certificates
8589
default: false
8690
do_upgrades:
8791
type: boolean
@@ -311,6 +315,7 @@ resources:
311315
__local_domain_suffix__: { get_param: local_domain_suffix }
312316
__openshiftVersion__: { get_param: openshift_version }
313317
__getCertificates__: { get_param: get_certificates }
318+
__stagingCerts__: { get_param: staging_certs }
314319
__doUpgrades__: { get_param: do_upgrades }
315320
__installLogging__: { get_param: install_logging }
316321
__loggingClusterSize__: { get_param: logging_cluster_size }

environment_example.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ parameter_defaults:
1414
s3_bucket_name: <existing s3 bucket to use - note this must exist already!>
1515
# Process specifics to run in the ansible deployment after heat has finished
1616
get_certificates: <whether to get certificates from letsencrypt - requires external DNS setup>
17+
staging_certs: <if certificates should be production LE or staging>
1718
do_upgrades: <whether to perform node patching prior to deployment>
1819
openshift_version: <major version number default is 3.9, 3.9 is the minimum now>
1920
# Aggregated logging options

files/setup_bastion.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
s3bucketname: __s3bucketname__
2828
openshiftVersion: "__openshiftVersion__"
2929
getCertificates: __getCertificates__
30+
stagingCerts: __stagingCerts__
3031
doUpgrades: __doUpgrades__
3132
installLogging: __installLogging__
3233
loggingClusterSize: __loggingClusterSize__
@@ -244,6 +245,7 @@
244245
localDomainSuffix: {{ localDomainSuffix }}
245246
openshiftVersion: "{{ openshiftVersion }}"
246247
getCertificates: {{ getCertificates }}
248+
stagingCerts: {{ stagingCerts }}
247249
doUpgrades: {{ doUpgrades }}
248250
installLogging: {{ installLogging }}
249251
loggingClusterSize: {{ loggingClusterSize }}

top-level-template.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,11 @@ parameters:
6464
default: 3.7
6565
get_certificates:
6666
type: boolean
67-
description: download certificates with certbot during install
67+
description: download certificates with acme script during install
68+
default: false
69+
staging_certs:
70+
type: boolean
71+
description: use production or staging certificates
6872
default: false
6973
do_upgrades:
7074
type: boolean
@@ -468,7 +472,8 @@ resources:
468472
os_domain_id: { get_param: os_domain_id }
469473
s3_bucket_name: { get_param: s3_bucket_name }
470474
openshift_version: { get_param: openshift_version }
471-
get_certificates: { get_param: get_certificates }
475+
get_certificates: { get_param: get_certificates }
476+
staging_certs: { get_param: staging_certs }
472477
do_upgrades: { get_param: do_upgrades }
473478
internal_network: { get_attr: [internal_network, outputs, network] }
474479
internal_network_subnet: { get_attr: [internal_network, outputs, subnet] }

0 commit comments

Comments
 (0)