diff options
| author |   Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-06-06 06:43:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-06-06 06:43:41 +0000 |
| commit | 995656837a0950ccadab7d2b87eded85072ba70e (patch) | |
| tree | 6da1a6215b133e953ebbb347925b270b8ce73e16 | |
| parent | a1758a360cbc2d59aa0819b78050671b4839e005 (diff) | |
| parent | 153ce732de3f84bdc80daac9a5913ce643a6ca19 (diff) | |
Merge "Fix bug in apex module"
| -rw-r--r-- | resources/ansible_roles/qtip-generator/files/compute/setup.yml | 1 | ||||
| -rw-r--r-- | resources/ansible_roles/qtip/tasks/gather-facts-apex.yml | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/resources/ansible_roles/qtip-generator/files/compute/setup.yml b/resources/ansible_roles/qtip-generator/files/compute/setup.yml index d1ab2638..f5920c1f 100644 --- a/resources/ansible_roles/qtip-generator/files/compute/setup.yml +++ b/resources/ansible_roles/qtip-generator/files/compute/setup.yml @@ -17,7 +17,6 @@ - debug: "msg='please add hosts to SUT group in `hosts` file manually.'" {% else %} - hosts: [{{ installer_group[installer_type] }}] - gather_facts: no roles: - { role: qtip, tasks: generate-inventory } {% endif %} diff --git a/resources/ansible_roles/qtip/tasks/gather-facts-apex.yml b/resources/ansible_roles/qtip/tasks/gather-facts-apex.yml index f7112554..a5799f3d 100644 --- a/resources/ansible_roles/qtip/tasks/gather-facts-apex.yml +++ b/resources/ansible_roles/qtip/tasks/gather-facts-apex.yml @@ -10,11 +10,11 @@ --- - name: gathering overcloud baremetal info - shell: . /root/stackrc && openstack baremetal list --fields instance_uuid properties provision_state --format json + shell: "source {{ ansible_env.HOME}}/stackrc && openstack baremetal list --fields instance_uuid properties provision_state --format json" register: baremetal_info - name: gathering overcloud server info - shell: . /root/stackrc && openstack server list --format json + shell: "source {{ ansible_env.HOME }}/stackrc && openstack server list --format json" register: server_info - name: generating inventory |