added staging cert parameter (#114)

UKCloud · Jan 28, 2020 · d9bcc96 · d9bcc96
1 parent 6b4a138
commit d9bcc96
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/bastion-template.yaml b/bastion-template.yaml
@@ -81,7 +81,11 @@ parameters:
     default: 3.7
   get_certificates:
     type: boolean
-    description: download certificates with certbot during install
+    description: download certificates with acme script during install
+    default: false
+  staging_certs:
+    type: boolean
+    description: use production or staging certificates
     default: false
   do_upgrades:
     type: boolean
@@ -311,6 +315,7 @@ resources:
             __local_domain_suffix__: { get_param: local_domain_suffix }
             __openshiftVersion__: { get_param: openshift_version }
             __getCertificates__: { get_param: get_certificates }
+            __stagingCerts__: { get_param: staging_certs }
             __doUpgrades__: { get_param: do_upgrades }
             __installLogging__: { get_param: install_logging }
             __loggingClusterSize__: { get_param: logging_cluster_size }

diff --git a/environment_example.yaml b/environment_example.yaml
@@ -14,6 +14,7 @@ parameter_defaults:
   s3_bucket_name: <existing s3 bucket to use - note this must exist already!>
   # Process specifics to run in the ansible deployment after heat has finished
   get_certificates: <whether to get certificates from letsencrypt - requires external DNS setup>
+  staging_certs: <if certificates should be production LE or staging>
   do_upgrades: <whether to perform node patching prior to deployment>
   openshift_version: <major version number default is 3.9, 3.9 is the minimum now>
   # Aggregated logging options

diff --git a/files/setup_bastion.yaml b/files/setup_bastion.yaml
@@ -27,6 +27,7 @@
     s3bucketname: __s3bucketname__
     openshiftVersion: "__openshiftVersion__"
     getCertificates: __getCertificates__
+    stagingCerts: __stagingCerts__
     doUpgrades: __doUpgrades__
     installLogging: __installLogging__
     loggingClusterSize: __loggingClusterSize__
@@ -244,6 +245,7 @@
           localDomainSuffix: {{ localDomainSuffix }}
           openshiftVersion: "{{ openshiftVersion }}"
           getCertificates: {{ getCertificates }}
+          stagingCerts: {{ stagingCerts }}
           doUpgrades: {{ doUpgrades }}
           installLogging: {{ installLogging }}
           loggingClusterSize: {{ loggingClusterSize }}

diff --git a/top-level-template.yaml b/top-level-template.yaml
@@ -64,7 +64,11 @@ parameters:
     default: 3.7
   get_certificates:
     type: boolean
-    description: download certificates with certbot during install
+    description: download certificates with acme script during install
+    default: false
+  staging_certs:
+    type: boolean
+    description: use production or staging certificates
     default: false
   do_upgrades:
     type: boolean
@@ -468,7 +472,8 @@ resources:
         os_domain_id: { get_param: os_domain_id }
         s3_bucket_name: { get_param: s3_bucket_name }
         openshift_version: { get_param: openshift_version }
-        get_certificates: { get_param: get_certificates } 
+        get_certificates: { get_param: get_certificates }
+        staging_certs: { get_param: staging_certs }
         do_upgrades: { get_param: do_upgrades }
         internal_network: { get_attr: [internal_network, outputs, network] }
         internal_network_subnet: { get_attr: [internal_network, outputs, subnet] }