diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2017-07-20 20:17:36 +0800 |
|---|---|---|
| committer | Harry Huang <huangxiangyu5@huawei.com> | 2017-07-24 10:33:30 +0800 |
| commit | 069835924120224ec46fc40877c89ac48608a6f5 (patch) | |
| tree | 3e5e1e09affa32c648f766872fe441e0ae1d4dd1 /deploy/adapters | |
| parent | f12c7c6d19eb21cd99690271f4ef71794a24b683 (diff) | |
Dynamic Inventory
JIRA: COMPASS-556
1. using dynamic ansible inventory
2. modify Class AnsibleInstaller in compass-tasks
3. modify compass conf to support this behavior
4. specify docker image in /deploy/conf/compass.conf
5. remove clusterhost status update in playbook_done.py
Change-Id: I04079547c8b251571ae4e5b165d3bf425b8913b7
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'deploy/adapters')
| -rw-r--r-- | deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml | 15 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/sync-inventory/tasks/main.yml | 15 |
2 files changed, 23 insertions, 7 deletions
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml index 1e721aa6..3691a921 100644 --- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml +++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml @@ -27,10 +27,11 @@ - hosts: localhost remote_user: root roles: - - role: config-osa - - role: setup-host - - role: setup-infrastructure - - role: setup-openstack - - role: setup-openvswitch - - role: setup-opendaylight - - role: post-openstack + - config-osa + - setup-host + - setup-infrastructure + - setup-openstack + - sync-inventory + - setup-openvswitch + - setup-opendaylight + - post-openstack diff --git a/deploy/adapters/ansible/roles/sync-inventory/tasks/main.yml b/deploy/adapters/ansible/roles/sync-inventory/tasks/main.yml new file mode 100644 index 00000000..0db1c7cc --- /dev/null +++ b/deploy/adapters/ansible/roles/sync-inventory/tasks/main.yml @@ -0,0 +1,15 @@ +# ############################################################################# +# # Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# # +# # All rights reserved. This program and the accompanying materials +# # are made available under the terms of the Apache License, Version 2.0 +# # which accompanies this distribution, and is available at +# # http://www.apache.org/licenses/LICENSE-2.0 +# # ############################################################################# +--- +- name: sync inventory + shell: > + "{{ run_dir }}"/inventories/inventory.py --merge + /etc/openstack_deploy/openstack_inventory.json + +- meta: refresh_inventory |