summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-12-16 19:36:34 +0000
committerGerrit Code Review <review@openstack.org>2018-12-16 19:36:34 +0000
commit643455abb7d7f18ab24954d69d0340dbc2202378 (patch)
treed01ded451529198c850f88196e5b6952c7f0c480
parentfc7e347226f5f65ed4578d58b93165e05a56dee4 (diff)
parent407396a66650cae1113e33c18d1b4d943f9dc92a (diff)
Merge "Add proxy override for Armada chart"
-rw-r--r--deployment_files/global/v1.0dev/software/charts/ucp/armada/armada.yaml2
-rw-r--r--deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/armada/armada.yaml44
2 files changed, 46 insertions, 0 deletions
diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/armada/armada.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/armada/armada.yaml
index dce9d5a..07243eb 100644
--- a/deployment_files/global/v1.0dev/software/charts/ucp/armada/armada.yaml
+++ b/deployment_files/global/v1.0dev/software/charts/ucp/armada/armada.yaml
@@ -6,6 +6,8 @@ metadata:
6 layeringDefinition: 6 layeringDefinition:
7 abstract: false 7 abstract: false
8 layer: global 8 layer: global
9 labels:
10 name: ucp-armada
9 storagePolicy: cleartext 11 storagePolicy: cleartext
10 substitutions: 12 substitutions:
11 # Chart source 13 # Chart source
diff --git a/deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/armada/armada.yaml b/deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/armada/armada.yaml
new file mode 100644
index 0000000..26eeac2
--- /dev/null
+++ b/deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/armada/armada.yaml
@@ -0,0 +1,44 @@
1---
2schema: armada/Chart/v1
3metadata:
4 schema: metadata/Document/v1
5 name: ucp-armada
6 replacement: true
7 layeringDefinition:
8 abstract: false
9 layer: type
10 parentSelector:
11 name: ucp-armada
12 actions:
13 - method: merge
14 path: .
15 storagePolicy: cleartext
16 substitutions:
17 # HTTP Proxy env
18 - src:
19 schema: pegleg/CommonAddresses/v1
20 name: common-addresses
21 path: .proxy.http
22 dest:
23 path: .values.pod.env.armada_api[0].value
24 - src:
25 schema: pegleg/CommonAddresses/v1
26 name: common-addresses
27 path: .proxy.https
28 dest:
29 path: .values.pod.env.armada_api[1].value
30 - src:
31 schema: pegleg/CommonAddresses/v1
32 name: common-addresses
33 path: .proxy.no_proxy
34 dest:
35 path: .values.pod.env.armada_api[2].value
36data:
37 values:
38 pod:
39 env:
40 armada_api:
41 - name: http_proxy
42 - name: https_proxy
43 - name: no_proxy
44...