commit 4986abc2df76feab18908baa6052aa5de92c984e
author Jiri Broulik <jbroulik@mirantis.com> Tue Jan 09 15:27:15 2018 +0100
committer Jiri Broulik <jbroulik@mirantis.com> Tue Jan 09 15:27:15 2018 +0100
tree 3ede227c78e12b9ebe27953e7e048a1d782fb2ca
parent d1375f760079580924a8ed4d55c5dca880a49a00

CC if condition fix

Change-Id: I2ef684d9380e789afbcb0c8ac73131d3d7771542

generate-cookiecutter-products.groovy

diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 14b6c99..989c4c2 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -160,12 +160,12 @@
             smc['DEPLOY_NETWORK_GW'] = templateContext['default_context']['deploy_network_gateway']
             smc['DEPLOY_NETWORK_NETMASK'] = templateContext['default_context']['deploy_network_netmask']
             smc['DNS_SERVERS'] = templateContext['default_context']['dns_server01']
-            if (templateContext.default_context.local_repositories && templateContext.default_context.local_repositories == 'True'){
+            if (templateContext.default_context.local_repositories || templateContext.default_context.local_repositories == 'True'){
                 smc['PIPELINES_FROM_ISO'] = 'false'
                 smc['PIPELINE_REPO_URL'] = 'http://' + templateContext['default_context']['aptly_server_deploy_address'] + ':8088'
             }
-            if (templateContext.default_context.upstream_proxy_enabled && templateContext.default_context.upstream_proxy_enabled == 'True'){
-                if (templateContext.default_context.upstream_proxy_auth_enabled && templateContext.default_context.upstream_proxy_auth_enabled == 'True'){
+            if (templateContext.default_context.upstream_proxy_enabled || templateContext.default_context.upstream_proxy_enabled == 'True'){
+                if (templateContext.default_context.upstream_proxy_auth_enabled || templateContext.default_context.upstream_proxy_auth_enabled == 'True'){
                     smc['http_proxy'] = 'http://' + templateContext['default_context']['upstream_proxy_user'] + ':' + templateContext['default_context']['upstream_proxy_password'] + '@' + templateContext['default_context']['upstream_proxy_address'] + ':' + templateContext['default_context']['upstream_proxy_port']
                     smc['https_proxy'] = 'http://' + templateContext['default_context']['upstream_proxy_user'] + ':' + templateContext['default_context']['upstream_proxy_password'] + '@' + templateContext['default_context']['upstream_proxy_address'] + ':' + templateContext['default_context']['upstream_proxy_port']
                 } else {
@@ -185,7 +185,7 @@
             // save cfg iso to artifacts
             archiveArtifacts artifacts: "output-${clusterName}/${saltMaster}.${clusterDomain}-config.iso"
 
-            if (templateContext.default_context.local_repositories && templateContext.default_context.local_repositories == 'True'){
+            if (templateContext.default_context.local_repositories || templateContext.default_context.local_repositories == 'True'){
                 def aptlyServerHostname = templateContext.default_context.aptly_server_hostname
                 def user_data_script_apt_url = "https://raw.githubusercontent.com/Mirantis/mcp-common-scripts/master/config-drive/mirror_config.sh"
                 sh "wget -O mirror_config.sh ${user_data_script_apt_url}"