Proxy support enhancement
Added gate scripts and playbook enhancement to run airshipctl behind proxy. Change-Id: Icc3cdcd6fd150420103f907cd1871feba1ccd223 Signed-off-by: James Gu <james.gu@att.com>
This commit is contained in:
parent
21dceb20d1
commit
afcfdb5c6e
@ -32,13 +32,9 @@ to define the following environment variables with your organization's
|
||||
information:
|
||||
|
||||
```
|
||||
http_proxy=http://username:password@host:port
|
||||
https_proxy=http://username:password@host:port
|
||||
no_proxy="localhost,127.0.0.1"
|
||||
HTTP_PROXY=http://username:password@host:port
|
||||
HTTPS_PROXY=http://username:password@host:port
|
||||
NO_PROXY="localhost,127.0.0.1"
|
||||
PROXY=http://username:password@host:port
|
||||
USE_PROXY=true
|
||||
```
|
||||
|
||||
|
@ -10,4 +10,9 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
remote_work_dir: "/tmp/airship"
|
||||
remote_work_dir: "/tmp/airship"
|
||||
proxy:
|
||||
enabled: "{{ lookup('env', 'USE_PROXY', default='false') }}"
|
||||
http: "{{ lookup('env', 'HTTP_PROXY', default='') }}"
|
||||
https: "{{ lookup('env', 'HTTPS_PROXY', default='') }}"
|
||||
noproxy: "{{ lookup('env', 'NO_PROXY', default='') }}"
|
||||
|
@ -11,5 +11,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
proxy:
|
||||
enabled: false
|
||||
http:
|
||||
noproxy:
|
||||
https:
|
||||
noproxy:
|
||||
|
@ -20,8 +20,8 @@
|
||||
--kubeconfig {{ airshipctl_config_dir_default | default(ansible_env.HOME) }}/.airship/kubeconfig \
|
||||
version
|
||||
register: airship_kubecofig_version
|
||||
retries: 50
|
||||
delay: 20
|
||||
retries: 100
|
||||
delay: 50
|
||||
until: airship_kubecofig_version.rc == 0
|
||||
|
||||
- name: debug kubectl version
|
||||
|
@ -92,6 +92,11 @@
|
||||
url: http://{{ sushy_emulator_frontend_servername }}:{{sushy_emulator_frontend_http_port }}/redfish/v1/Systems?format=json
|
||||
method: GET
|
||||
return_content: yes
|
||||
register: sushy_get_result
|
||||
until: sushy_get_result.status == 200
|
||||
retries: 18
|
||||
delay: 10
|
||||
|
||||
- name: Check with auth
|
||||
when: sushy_emulator_frontend_user is defined
|
||||
uri:
|
||||
|
@ -24,3 +24,8 @@ zuul:
|
||||
log_root: "$TMP_DIR"
|
||||
project:
|
||||
src_dir: "$AIRSHIPCTL_WS"
|
||||
proxy:
|
||||
enabled: "$USE_PROXY"
|
||||
http: "$HTTP_PROXY"
|
||||
https: "$HTTPS_PROXY"
|
||||
noproxy: "$NO_PROXY"
|
||||
|
Loading…
Reference in New Issue
Block a user