diff options
author | Andrew Butcher <abutcher@redhat.com> | 2016-09-27 16:49:38 -0400 |
---|---|---|
committer | Andrew Butcher <abutcher@redhat.com> | 2016-09-28 15:30:42 -0400 |
commit | 37788eb7590babf79bbec52fb29211ada7136878 (patch) | |
tree | a8b497cf7a2b533fdb7727fb397ea016714b509d /roles/openshift_node/tasks/main.yml | |
parent | 43f52e292afac7bde5e588377e56d9c49574806c (diff) | |
download | openshift-37788eb7590babf79bbec52fb29211ada7136878.tar.gz openshift-37788eb7590babf79bbec52fb29211ada7136878.tar.bz2 openshift-37788eb7590babf79bbec52fb29211ada7136878.tar.xz openshift-37788eb7590babf79bbec52fb29211ada7136878.zip |
Suppress more warnings.
Diffstat (limited to 'roles/openshift_node/tasks/main.yml')
-rw-r--r-- | roles/openshift_node/tasks/main.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 995169dd6..be07bd2d3 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -93,9 +93,9 @@ create: true with_items: - regex: '^AWS_ACCESS_KEY_ID=' - line: "AWS_ACCESS_KEY_ID={{ openshift_cloudprovider_aws_access_key }}" + line: "AWS_ACCESS_KEY_ID={{ openshift_cloudprovider_aws_access_key | default('') }}" - regex: '^AWS_SECRET_ACCESS_KEY=' - line: "AWS_SECRET_ACCESS_KEY={{ openshift_cloudprovider_aws_secret_key }}" + line: "AWS_SECRET_ACCESS_KEY={{ openshift_cloudprovider_aws_secret_key | default('') }}" when: "openshift_cloudprovider_kind is defined and openshift_cloudprovider_kind == 'aws' and openshift_cloudprovider_aws_access_key is defined and openshift_cloudprovider_aws_secret_key is defined" notify: - restart node @@ -134,6 +134,10 @@ command: > curl --silent --cacert {{ openshift.common.config_base }}/node/ca.crt {{ openshift_node_master_api_url }}/healthz/ready + args: + # Disables the following warning: + # Consider using get_url or uri module rather than running curl + warn: no register: api_available_output until: api_available_output.stdout == 'ok' retries: 120 |