Code Review
/
yaml_builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
updated templates and scripts for Airship 1.3
[yaml_builds.git]
/
site_type
/
sriov-a13
/
templates
/
software
/
charts
/
ucp
/
promenade
/
promenade.j2
diff --git
a/site_type/sriov/airship-treasuremap/site/airship-seaworthy/software/charts/ucp/promenade/promenade.yaml
b/site_type/sriov-a13/templates/software/charts/ucp/promenade/promenade.j2
similarity index 75%
rename from
site_type/sriov/airship-treasuremap/site/airship-seaworthy/software/charts/ucp/promenade/promenade.yaml
rename to
site_type/sriov-a13/templates/software/charts/ucp/promenade/promenade.j2
index
543083d
..
82848a0
100644
(file)
--- a/
site_type/sriov/airship-treasuremap/site/airship-seaworthy/software/charts/ucp/promenade/promenade.yaml
+++ b/
site_type/sriov-a13/templates/software/charts/ucp/promenade/promenade.j2
@@
-18,33
+18,37
@@
data:
values:
pod:
env:
values:
pod:
env:
- promenade_api: []
+ promenade_api:
+ - name: no_proxy
+ value: localhost,127.0.0.1,192.168.0.0/16,172.0.0.0/8,10.0.0.0/8
+ - name: NO_PROXY
+ value: localhost,127.0.0.1,192.168.0.0/16,172.0.0.0/8,10.0.0.0/8
# NEWSITE-CHANGEME: If your site uses an http proxy, enter it here.
# Otherwise comment out these lines.
# - name: http_proxy
# NEWSITE-CHANGEME: If your site uses an http proxy, enter it here.
# Otherwise comment out these lines.
# - name: http_proxy
- # value:
http://proxy.example.com:8080
+ # value:
'http://proxy.example.com:8080'
# NEWSITE-CHANGEME: If your site uses an https proxy, enter it here.
# Otherwise comment out these lines.
# - name: https_proxy
# NEWSITE-CHANGEME: If your site uses an https proxy, enter it here.
# Otherwise comment out these lines.
# - name: https_proxy
- # value:
http://proxy.example.com:8080
+ # value:
'http://proxy.example.com:8080'
# NEWSITE-CHANGEME: If your site uses an http/https proxy, enter the
# IPs / domain names which the proxy should not be used for (i.e. the
# cluster domain and kubernetes service_cidr defined in common-addresses)
# Otherwise comment out these lines.
# - name: no_proxy
# NEWSITE-CHANGEME: If your site uses an http/https proxy, enter the
# IPs / domain names which the proxy should not be used for (i.e. the
# cluster domain and kubernetes service_cidr defined in common-addresses)
# Otherwise comment out these lines.
# - name: no_proxy
- # value:
10.36.0.1,.cluster.local
+ # value:
'10.96.0.1,.cluster.local'
# NEWSITE-CHANGEME: If your site uses an http proxy, enter it here.
# Otherwise comment out these lines.
# - name: HTTP_PROXY
# NEWSITE-CHANGEME: If your site uses an http proxy, enter it here.
# Otherwise comment out these lines.
# - name: HTTP_PROXY
- # value:
http://proxy.example.com:8080
+ # value:
'http://proxy.example.com:8080'
# NEWSITE-CHANGEME: If your site uses an https proxy, enter it here.
# Otherwise comment out these lines.
# - name: HTTPS_PROXY
# NEWSITE-CHANGEME: If your site uses an https proxy, enter it here.
# Otherwise comment out these lines.
# - name: HTTPS_PROXY
- # value:
http://proxy.example.com:8080
+ # value:
'http://proxy.example.com:8080'
# NEWSITE-CHANGEME: If your site uses an http/https proxy, enter the
# IPs / domain names which the proxy should not be used for (i.e. the
# cluster domain and kubernetes service_cidr defined in common-addresses)
# Otherwise comment out these lines.
# - name: NO_PROXY
# NEWSITE-CHANGEME: If your site uses an http/https proxy, enter the
# IPs / domain names which the proxy should not be used for (i.e. the
# cluster domain and kubernetes service_cidr defined in common-addresses)
# Otherwise comment out these lines.
# - name: NO_PROXY
- # value:
10.36.0.1,.cluster.local
+ # value:
'10.96.0.1,.cluster.local'
...
...