summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorZhijiang Hu <hu.zhijiang@zte.com.cn>2016-12-20 07:29:16 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-20 07:29:16 +0000
commitd5df56b8ef5d5967e471db482d09fac36afc449a (patch)
treeffda79a1f00c54ef81f854b38037f18cec4d5dc9 /templates
parent3dce9ea92689ace8b88c3996b28adc09d3ab8197 (diff)
parent0b57e3be28f1b42d7cea436feb04fbcdf83e8484 (diff)
Merge "implement deploy on virthal pod"
Diffstat (limited to 'templates')
-rw-r--r--templates/virtual_environment/networks/daisy.xml (renamed from templates/virtual_environment/networks/daisy1.xml)0
-rw-r--r--templates/virtual_environment/networks/os-all_in_one.xml (renamed from templates/virtual_environment/networks/daisy2.xml)0
2 files changed, 0 insertions, 0 deletions
diff --git a/templates/virtual_environment/networks/daisy1.xml b/templates/virtual_environment/networks/daisy.xml
index 91b2dff4..91b2dff4 100644
--- a/templates/virtual_environment/networks/daisy1.xml
+++ b/templates/virtual_environment/networks/daisy.xml
diff --git a/templates/virtual_environment/networks/daisy2.xml b/templates/virtual_environment/networks/os-all_in_one.xml
index f8e86830..f8e86830 100644
--- a/templates/virtual_environment/networks/daisy2.xml
+++ b/templates/virtual_environment/networks/os-all_in_one.xml