Browse Source

Merge "Fix Armada proxy override and update the docs"

changes/34/638034/1
Zuul 3 months ago
parent
commit
3c92934ece

+ 0
- 44
deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/armada/armada.yaml View File

@@ -1,44 +0,0 @@
1
----
2
-schema: armada/Chart/v1
3
-metadata:
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
36
-data:
37
-  values:
38
-    pod:
39
-      env:
40
-        armada_api:
41
-          - name: http_proxy
42
-          - name: https_proxy
43
-          - name: no_proxy
44
-...

+ 35
- 22
manifests/dev_minimal/README.txt View File

@@ -22,6 +22,41 @@ versions file: deployment_files/global/v1.0dev/software/config/versions.yaml
22 22
 Running ../common/deploy_airship.sh will download and build into the
23 23
 /root/deploy directory.
24 24
 
25
+Proxy Configuration
26
+-------------------
27
+
28
+Configuration in this section is needed only if running the deployment
29
+behind a corporate proxy.
30
+
31
+1) 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
+
43
+2) 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.
48
+3) Change set-env.sh to use TARGET_SITE of 'dev-proxy'.
49
+4) 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
+
25 60
 Process
26 61
 -------
27 62
 1) Set up a VM with at least 4 cores and 12GB of memeory. 8 core/16GB is
@@ -29,19 +64,6 @@ Process
29 64
    extended use.
30 65
 2) Become root. All the commands are run as root.
31 66
 3) Update etc/hosts with IP/Hostname of your VM. e.g. 10.0.0.15 testvm1.
32
-Note: 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
-
45 67
 4) go to /root/deploy and clone airship-in-a-bottle. Switch to a target
46 68
    patchset if needed
47 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
50 72
 5) cd into /root/deploy/airship-in-a-bottle/manifests/dev_minimal
51 73
 6) Update the set-env.sh with the hostname and ip on the appropriate lines.
52 74
 7) source set-env.sh
53
-
54
-NOTE: 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
-
62 75
 8) ../common/deploy-airship.sh
63 76
 You may sepecify a target point to stop the deployment by using an argument of
64 77
 "collect", "genesis", or "deploy" to the deploy_airship.sh. It will

Loading…
Cancel
Save