ansible: update package proxy code

re-enable retries

Change-Id: I77738250e8aa8de3c8a8a1019093af04ce785ae0
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>

1 files changed, 22 insertions, 33 deletions

diff --git a/ansible/roles/set_package_installer_proxy/tasks/main.yml b/ansible/roles/set_package_installer_proxy/tasks/main.yml
index 9838cd489..fea424bf3 100644
--- a/ansible/roles/set_package_installer_proxy/tasks/main.yml
+++ b/ansible/roles/set_package_installer_proxy/tasks/main.yml
@@ -1,40 +1,29 @@
-# Copyright (c) 2016, Intel Corporation.
+# Copyright (c) 2016-2017 Intel Corporation
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#     * Redistributions of source code must retain the above copyright notice,
-#       this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Intel Corporation nor the names of its contributors
-#       may be used to endorse or promote products derived from this software
-#       without specific prior written permission.
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 ---
   - name: Configure package manager proxy
     include: "{{ ansible_os_family }}.yml"
 
-#  - async_status: jid={{ test_proxy_job_id.ansible_job_id }}
-#    register: test_proxy_result
-#    until: test_proxy_result.finished
-#    retries: 60
-#    delay: 10
-#
-#  - debug: var=hostvars[item]['test_proxy_result']
-#    with_items: "{{ hostvars }}"
-#
-#  - name: Verify proxy test
-#    fail: msg="proxy test timeout"
-#    when: "{{ test_proxy_result.get('finished', 0) == 0 }}"
+  - async_status: jid={{ test_proxy_job_id.ansible_job_id }}
+    register: test_proxy_result
+    until: test_proxy_result.finished
+    retries: 60
+    delay: 10
+
+  - debug: var=hostvars[item]['test_proxy_result']
+    with_items: "{{ hostvars }}"
+
+  - name: Verify proxy test
+    fail: msg="proxy test timeout"
+    when: "test_proxy_result.get('finished', 0) == 0"