aboutsummaryrefslogtreecommitdiffstats
path: root/util/docker-compose
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2018-12-04 11:41:34 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2019-02-01 17:24:50 +0800
commite29a4ea1b77bdb9e78e2fabac8a3029c4c2b61fc (patch)
tree9279936c6157e4877a6f9630ef6918ef248beaef /util/docker-compose
parent5999d29ded67ee2847e58fa559dd9da29e1bd150 (diff)
Adapt compass4nfv scripts to new compass-deck
JIRA: COMPASS-612 1. pass machine info through file 2. generate mac address in config_parse.py Change-Id: Iaaf0f2b1f4ab97e8200c8c046746168d991570e3 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'util/docker-compose')
-rwxr-xr-xutil/docker-compose/roles/machines/tasks/main.yml14
1 files changed, 4 insertions, 10 deletions
diff --git a/util/docker-compose/roles/machines/tasks/main.yml b/util/docker-compose/roles/machines/tasks/main.yml
index 365a9d90..7b4a9f18 100755
--- a/util/docker-compose/roles/machines/tasks/main.yml
+++ b/util/docker-compose/roles/machines/tasks/main.yml
@@ -1,21 +1,15 @@
---
-- name: create switch file if test mode enabled
- template: src=switch_machines_file.j2
- dest="{{ docker_compose_dir }}/switch_machines_file"
- tags:
- - redploy
-
- name: docker cp switch_machines_file
shell: |
- docker cp "{{ docker_compose_dir }}/switch_machines_file" \
- compass-deck:/tmp/switch_machines_file
+ docker cp "{{ docker_compose_dir }}/machine" \
+ compass-deck:/tmp/machine
tags:
- redploy
- name: inject switches and mac addresses
shell: |
docker exec compass-deck bash -c \
- "/opt/compass/bin/manage_db.py set_switch_machines \
- --switch_machines_file /tmp/switch_machines_file"
+ "/opt/compass/bin/manage_db.py set_machine \
+ --machine_file /tmp/machine"
tags:
- redploy