diff options
| author |   wutianwei <wutianwei1@huawei.com> | 2017-12-26 15:57:48 +0800 |
|---|---|---|
| committer | wutianwei <wutianwei1@huawei.com> | 2017-12-28 16:18:36 +0800 |
| commit | e00b5105df2fd67ffbc6c8284e579f6e8d00b3e5 (patch) | |
| tree | de535a87afddb1e4386a1bef3b8bef107928405a /deploy | |
| parent | 84f36e9f062c056cbb8ee15c94c4cc208dbc7766 (diff) | |
change the failure judgement condition for setup-openstack
1. Don't check failed=1 instead of checking the last task name.
2. comment the fix pip version yml
Change-Id: I3c22074f319a1d0f1ae0f3df43ca6e10ec684aac
Signed-off-by: wutianwei <wutianwei1@huawei.com>
Diffstat (limited to 'deploy')
3 files changed, 14 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/fix_rescue.yml b/deploy/adapters/ansible/roles/config-osa/tasks/fix_rescue.yml index eea06b48..ff7d4250 100644 --- a/deploy/adapters/ansible/roles/config-osa/tasks/fix_rescue.yml +++ b/deploy/adapters/ansible/roles/config-osa/tasks/fix_rescue.yml @@ -41,3 +41,13 @@ dest: "/opt/openstack-ansible/playbooks/lxc-hosts-setup.yml" regexp: "max_fail_percentage*" state: absent + +- name: fix rescue problem for setup-openstack + blockinfile: + dest: "/opt/openstack-ansible/playbooks/setup-openstack.yml" + block: | + - hosts: localhost + user: root + tasks: + - name: Mark setup-openstack completed + shell: echo "Setup openstack completed!" diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml index 855412ab..4c477442 100755 --- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml +++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml @@ -322,6 +322,8 @@ - include: meters.yml -- include: fix_pip_version.yml +# upstream has fix this issue so somments it +# maybe will use in the furture +# - include: fix_pip_version.yml - include: fix_rescue.yml diff --git a/deploy/adapters/ansible/roles/setup-openstack/tasks/main.yml b/deploy/adapters/ansible/roles/setup-openstack/tasks/main.yml index a55b1a01..a6ecb82f 100644 --- a/deploy/adapters/ansible/roles/setup-openstack/tasks/main.yml +++ b/deploy/adapters/ansible/roles/setup-openstack/tasks/main.yml @@ -20,7 +20,7 @@ - fail: msg: "some task failed when setup openstack." - when: setup_openstack_result.stdout.find('failed=1') != -1 + when: setup_openstack_result.stdout.find('Mark setup-openstack completed') == -1 - fail: msg: "some host are unreachable." |