diff options
| author |   Yifei Xue <xueyifei@huawei.com> | 2017-12-28 08:21:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-28 08:21:23 +0000 |
| commit | e23b6f4eadb659f8cc7f1d84b99a7a4afc4fe47c (patch) | |
| tree | 9e622b55c0708f7c9c629cca78c9f1a5dcdcd62c /deploy/adapters | |
| parent | c8c8a49e2ad96763915b9f9c4f52e68834ba1a1a (diff) | |
| parent | e00b5105df2fd67ffbc6c8284e579f6e8d00b3e5 (diff) | |
Merge "change the failure judgement condition for setup-openstack"
Diffstat (limited to 'deploy/adapters')
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 ceceb956..4ca4bb95 100755 --- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml +++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml @@ -335,6 +335,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." |