summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny L <el247k@att.com>2019-01-14 16:27:09 +0000
committerEvgeny L <el247k@att.com>2019-01-14 16:27:09 +0000
commitfe91d22a9d071aa537df19c994a48e91ab932cdd (patch)
treeebe26d0fb925f51c1e569225214b3afe46aaa5a3
parentb30c0d6ab4754b4e43708895da637fa9e8d31b83 (diff)
Fix Armada proxy override and update the docs
Global proxy configuration for Armada breaks connectivity [1] to Tiller. As a workaround every chart should have "proxy_server" parameter specified, when running behind the proxy. This patch also extracts all proxy related configurations into a separate section. [1] http://lists.airshipit.org/pipermail/airship-discuss/2018-December/000202.html Change-Id: If41131c891b5f226c1d4ed85a210a5801effcfe2
Notes
Notes (review): Code-Review+1: Drew Walters <drewwalters96@gmail.com> Code-Review+2: Scott Hussey <sthussey@att.com> Code-Review+2: Kaspars Skels <kaspars.skels@gmail.com> Workflow+1: Kaspars Skels <kaspars.skels@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 19 Feb 2019 20:21:07 +0000 Reviewed-on: https://review.openstack.org/630726 Project: openstack/airship-in-a-bottle Branch: refs/heads/master
-rw-r--r--deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/armada/armada.yaml44
-rw-r--r--manifests/dev_minimal/README.txt57
2 files changed, 35 insertions, 66 deletions
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
deleted file mode 100644
index 26eeac2..0000000
--- a/deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/armada/armada.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
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...
diff --git a/manifests/dev_minimal/README.txt b/manifests/dev_minimal/README.txt
index 03832db..c947585 100644
--- a/manifests/dev_minimal/README.txt
+++ b/manifests/dev_minimal/README.txt
@@ -22,6 +22,41 @@ versions file: deployment_files/global/v1.0dev/software/config/versions.yaml
22Running ../common/deploy_airship.sh will download and build into the 22Running ../common/deploy_airship.sh will download and build into the
23/root/deploy directory. 23/root/deploy directory.
24 24
25Proxy Configuration
26-------------------
27
28Configuration in this section is needed only if running the deployment
29behind a corporate proxy.
30
311) Update the /etc/environment file, and append your proxy configurtion there.
32 Then you will need to source the /etc/environment to set the proxy environment.
33 For instance, you will need to add following lines in the
34 /etc/environment file, and then source it:
35
36 export http_proxy="your.proxy.address:port"
37 export https_proxy="your.proxy.address:port"
38 export no_proxy=".foo.com,.cluster.local,localhost,127.0.0.0/8,10.0.0.0/24"
39 export HTTP_PROXY="http://your.proxy.address:port"
40 export HTTPS_PROXY="http://your.proxy.address:port"
41 export NO_PROXY=".foo.com,.cluster.local,localhost,127.0.0.0/8,10.0.0.0/24"
42
432) Update the file deployment_files/site/dev-proxy/networks/common-addresses.yaml
44 to specify your proxy server and appropriate no_proxy list. In this file,
45 also update the dns list, and add your corporate name servers to the
46 dns list. This is done for name resolution of internal corporate
47 addresses behind the proxy.
483) Change set-env.sh to use TARGET_SITE of 'dev-proxy'.
494) Update "charts" section in deployment_files/global/v1.0dev/software/config/versions.yaml
50 file, every chart should include "proxy_server" parameter with proxy configuration.
51 For example:
52
53 armada:
54 type: git
55 location: https://git.openstack.org/openstack/airship-armada
56 subpath: charts/armada
57 reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
58 proxy_server: http://your.proxy.address:port
59
25Process 60Process
26------- 61-------
271) Set up a VM with at least 4 cores and 12GB of memeory. 8 core/16GB is 621) Set up a VM with at least 4 cores and 12GB of memeory. 8 core/16GB is
@@ -29,19 +64,6 @@ Process
29 extended use. 64 extended use.
302) Become root. All the commands are run as root. 652) Become root. All the commands are run as root.
313) Update etc/hosts with IP/Hostname of your VM. e.g. 10.0.0.15 testvm1. 663) Update etc/hosts with IP/Hostname of your VM. e.g. 10.0.0.15 testvm1.
32Note: If running this behind a corporate proxy, you will need to update the
33 /etc/environment file, and append your proxy configurtion there.
34 Then you will need to source the /etc/environment to set the proxy
35 environment.
36 For instance, you will need to add following lines in the
37 /etc/environment file, and then source it:
38 export http_proxy="your.proxy.address:port"
39 export https_proxy="your.proxy.address:port"
40 export no_proxy=".foo.com,.cluster.local,localhost,127.0.0.0/8,10.0.0.0/24"
41 export HTTP_PROXY="http://your.proxy.address:port"
42 export HTTPS_PROXY="http://your.proxy.address:port"
43 export NO_PROXY=".foo.com,.cluster.local,localhost,127.0.0.0/8,10.0.0.0/24"
44
454) go to /root/deploy and clone airship-in-a-bottle. Switch to a target 674) go to /root/deploy and clone airship-in-a-bottle. Switch to a target
46 patchset if needed 68 patchset if needed
47 4a) If you use a directory other than /root/deploy, /root/deploy will be 69 4a) If you use a directory other than /root/deploy, /root/deploy will be
@@ -50,15 +72,6 @@ Note: If running this behind a corporate proxy, you will need to update the
505) cd into /root/deploy/airship-in-a-bottle/manifests/dev_minimal 725) cd into /root/deploy/airship-in-a-bottle/manifests/dev_minimal
516) Update the set-env.sh with the hostname and ip on the appropriate lines. 736) Update the set-env.sh with the hostname and ip on the appropriate lines.
527) source set-env.sh 747) source set-env.sh
53
54NOTE: If running this behind a corporate proxy, you will need to update the
55 file deployment_files/site/dev-proxy/networks/common-addresses.yaml to
56 specify your proxy server and appropriate no_proxy list. In this file,
57 also update the dns list, and add your corporate name servers to the
58 dns list. This is done for name resolution of internal corporate
59 addresses behind the proxy.
60 Also change set-env.sh to use TARGET_SITE of 'dev-proxy'.
61
628) ../common/deploy-airship.sh 758) ../common/deploy-airship.sh
63You may sepecify a target point to stop the deployment by using an argument of 76You may sepecify a target point to stop the deployment by using an argument of
64"collect", "genesis", or "deploy" to the deploy_airship.sh. It will 77"collect", "genesis", or "deploy" to the deploy_airship.sh. It will