software/rapid-cdn: Avoid get for always present values

software/rapid-cdn/buildout.hash.cfg

@@ -30,7 +30,7 @@ md5sum = 877e08db0fb814882f716a9cd0429c83
 
 [profile-slave-list]
 filename = instance-slave-list.cfg.in
-md5sum = 2a0a3ace11bf1de5135672b9ae63e31e
+md5sum = 3271341d0f2f0f81dc970a458d4030a1
 
 [profile-master-publish-slave-information]
 filename = instance-master-publish-slave-information.cfg.in
@@ -62,11 +62,11 @@ md5sum = 975177dedf677d24e14cede5d13187ce
 
 [template-trafficserver-records-config]
 _update_hash_filename_ = templates/trafficserver/records.config.jinja2
-md5sum = 715baa302d562a7e4eddc3d1bf72f981
+md5sum = 4d980dbf70413c1758dda72c12c02246
 
 [template-trafficserver-storage-config]
 _update_hash_filename_ = templates/trafficserver/storage.config.jinja2
-md5sum = d022455a8610bac2dd51101edb035987
+md5sum = a45d35e4b847642fda8c2703dff92fcc
 
 [template-trafficserver-logging-yaml]
 _update_hash_filename_ = templates/trafficserver/logging.yaml.jinja2

software/rapid-cdn/instance-slave-list.cfg.in

@@ -3,7 +3,7 @@
 {%- set backend_slave_list = [] %}
 {%- set frontend_slave_list = [] %}
 {%- set part_list = [] %}
-{%- set cache_port = frontend_haproxy_configuration.get('cache-port') %}
+{%- set cache_port = frontend_haproxy_configuration['cache-port'] %}
 {%- set cache_access = "http://%s:%s/HTTP" % (instance_parameter_dict['ipv4-random'], cache_port) %}
 {%- set ssl_cache_access = "http://%s:%s/HTTPS" % (instance_parameter_dict['ipv4-random'], cache_port) %}
 {%- set backend_haproxy_http_url = 'http://%s:%s' % (instance_parameter_dict['ipv4-random'], backend_haproxy_configuration['http-port']) %}
@@ -284,7 +284,7 @@ log-directory = {{ '${slave-log-directory-dict:' + slave_reference + '}' }}
 [{{slave_logrotate_section}}]
 <= logrotate-entry-base
 name = ${:_buildout_section_name_}
-log = {{slave_parameter_dict.get('access_log')}} {{slave_parameter_dict.get('frontend_log')}} {{slave_parameter_dict.get('backend_log')}}
+log = {{slave_parameter_dict['access_log'] }} {{slave_parameter_dict['frontend_log'] }} {{slave_parameter_dict['backend_log'] }}
 backup = {{ '${' + slave_log_directory_section + ':log-directory}' }}
 rotate-num = {{ dumps('' ~ configuration['rotate-num']) }}
 # disable delayed compression, as log filenames shall be stable
@@ -297,9 +297,9 @@ recipe = plone.recipe.command
 stop-on-error = false
 log-directory = {{ '${' + slave_logrotate_section + ':backup}' }}
 command =
-  ln -sf {{slave_parameter_dict.get('access_log')}} ${:log-directory}/access.log
-  ln -sf {{slave_parameter_dict.get('frontend_log')}} ${:log-directory}/frontend.log
-  ln -sf {{slave_parameter_dict.get('backend_log')}} ${:log-directory}/backend.log
+  ln -sf {{slave_parameter_dict['access_log'] }} ${:log-directory}/access.log
+  ln -sf {{slave_parameter_dict['frontend_log'] }} ${:log-directory}/frontend.log
+  ln -sf {{slave_parameter_dict['backend_log'] }} ${:log-directory}/backend.log
 
 {#-   Set password for slave #}
 
@@ -398,7 +398,7 @@ local_ipv4 = {{ dumps('' ~ instance_parameter_dict['ipv4-random']) }}
 local-ipv4 = {{ dumps(instance_parameter_dict['ipv4-random']) }}
 global-ipv6 = {{ dumps(global_ipv6) }}
 https-port = {{ frontend_configuration['slave-introspection-https-port'] }}
-ip-access-certificate = {{ frontend_configuration.get('ip-access-certificate') }}
+ip-access-certificate = {{ frontend_configuration['ip-access-certificate'] }}
 nginx-mime = {{ software_parameter_dict['nginx_mime'] }}
 access-log = {{ dumps(frontend_haproxy_configuration['slave-introspection-access-log']) }}
 error-log = {{ dumps(frontend_haproxy_configuration['slave-introspection-error-log']) }}

software/rapid-cdn/templates/trafficserver/records.config.jinja2

@@ -156,7 +156,7 @@ CONFIG proxy.config.net.max_requests_in INT 10000
 #    https://docs.trafficserver.apache.org/records.config#ram-cache
 #    https://docs.trafficserver.apache.org/en/latest/admin-guide/files/storage.config.en.html
 ##############################################################################
-CONFIG proxy.config.cache.ram_cache.size INT {{ ats_configuration.get('ram-cache-size', '1G') }}
+CONFIG proxy.config.cache.ram_cache.size INT {{ ats_configuration['ram-cache-size'] }}
 CONFIG proxy.config.cache.ram_cache_cutoff INT 4194304
     # https://docs.trafficserver.apache.org/records.config#proxy-config-cache-limits-http-max-alts
 CONFIG proxy.config.cache.limits.http.max_alts INT 5

software/rapid-cdn/templates/trafficserver/storage.config.jinja2

@@ -50,4 +50,4 @@
 # A small default cache (256MB). This is set to allow for the regression test to succeed
 # most likely you'll want to use a larger cache. And, we definitely recommend the use
 # of raw devices for production caches.
-{{ ats_configuration.get("cache-path") }} {{ ats_configuration.get("disk-cache-size") }}
+{{ ats_configuration["cache-path"] }} {{ ats_configuration["disk-cache-size"] }}