diff options
| author |   xudan <xudan16@huawei.com> | 2017-06-22 00:04:51 -0400 |
|---|---|---|
| committer | xudan <xudan16@huawei.com> | 2017-06-22 00:04:51 -0400 |
| commit | 21563d9f2ed1da2161e23769da090ba8320c6d7f (patch) | |
| tree | 22893eecc2fd8ab8df03d7c3b598f438e17d30f2 | |
| parent | 9de3050873909448d675a47326cd4f153a47bef2 (diff) | |
Bugfix: Move userconfig directory into dovetail/dovetail
JITA: DOVETAIL-449
1. Dovetail cvp.0.1.0 link dovetail/dovetail to
/usr/local/lib/python2.7/dist-packages/dovetail/
2. The directory dovetail/userconfig is lost in this image
3. Move dovetail/userconfig into dovetail/dovetail/userconfig
Change-Id: I9da8389e02d92f35879ff5c6a1db1b7d984dd862
Signed-off-by: xudan <xudan16@huawei.com>
| -rw-r--r-- | dovetail/container.py | 2 | ||||
| -rwxr-xr-x | dovetail/run.py | 2 | ||||
| -rw-r--r-- | dovetail/userconfig/hosts.yaml (renamed from userconfig/hosts.yaml) | 0 | ||||
| -rw-r--r-- | dovetail/userconfig/pod.yaml.sample (renamed from userconfig/pod.yaml.sample) | 0 | ||||
| -rw-r--r-- | dovetail/userconfig/sdnvpn_config_testcase1.yaml (renamed from userconfig/sdnvpn_config_testcase1.yaml) | 0 | ||||
| -rw-r--r-- | dovetail/userconfig/sdnvpn_config_testcase2.yaml (renamed from userconfig/sdnvpn_config_testcase2.yaml) | 0 | ||||
| -rw-r--r-- | dovetail/userconfig/sdnvpn_config_testcase3.yaml (renamed from userconfig/sdnvpn_config_testcase3.yaml) | 0 | ||||
| -rw-r--r-- | dovetail/userconfig/sdnvpn_config_testcase4.yaml (renamed from userconfig/sdnvpn_config_testcase4.yaml) | 0 | ||||
| -rw-r--r-- | dovetail/userconfig/sdnvpn_config_testcase8.yaml (renamed from userconfig/sdnvpn_config_testcase8.yaml) | 0 |
9 files changed, 2 insertions, 2 deletions
diff --git a/dovetail/container.py b/dovetail/container.py index dd73096d..a1e213d8 100644 --- a/dovetail/container.py +++ b/dovetail/container.py @@ -158,7 +158,7 @@ class Container(object): hosts_config = "" hosts_config_path = os.path.abspath( - os.path.join(os.path.dirname(__file__), os.pardir, 'userconfig')) + os.path.join(os.path.dirname(__file__), 'userconfig')) try: with open(os.path.join(hosts_config_path, 'hosts.yaml')) as f: hosts_info = yaml.safe_load(f) diff --git a/dovetail/run.py b/dovetail/run.py index 80cb0980..a8fa6470 100755 --- a/dovetail/run.py +++ b/dovetail/run.py @@ -195,7 +195,7 @@ def get_result_path(): def copy_userconfig_files(logger): - dovetail_home = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + dovetail_home = os.path.dirname(os.path.abspath(__file__)) userconfig_path = os.path.join(dovetail_home, 'userconfig') pre_config_path = dt_cfg.dovetail_config['config_dir'] if not os.path.isdir(pre_config_path): diff --git a/userconfig/hosts.yaml b/dovetail/userconfig/hosts.yaml index e4687dfb..e4687dfb 100644 --- a/userconfig/hosts.yaml +++ b/dovetail/userconfig/hosts.yaml diff --git a/userconfig/pod.yaml.sample b/dovetail/userconfig/pod.yaml.sample index 26636a6b..26636a6b 100644 --- a/userconfig/pod.yaml.sample +++ b/dovetail/userconfig/pod.yaml.sample diff --git a/userconfig/sdnvpn_config_testcase1.yaml b/dovetail/userconfig/sdnvpn_config_testcase1.yaml index d9e4a1b4..d9e4a1b4 100644 --- a/userconfig/sdnvpn_config_testcase1.yaml +++ b/dovetail/userconfig/sdnvpn_config_testcase1.yaml diff --git a/userconfig/sdnvpn_config_testcase2.yaml b/dovetail/userconfig/sdnvpn_config_testcase2.yaml index 07b0adfa..07b0adfa 100644 --- a/userconfig/sdnvpn_config_testcase2.yaml +++ b/dovetail/userconfig/sdnvpn_config_testcase2.yaml diff --git a/userconfig/sdnvpn_config_testcase3.yaml b/dovetail/userconfig/sdnvpn_config_testcase3.yaml index 60592cbb..60592cbb 100644 --- a/userconfig/sdnvpn_config_testcase3.yaml +++ b/dovetail/userconfig/sdnvpn_config_testcase3.yaml diff --git a/userconfig/sdnvpn_config_testcase4.yaml b/dovetail/userconfig/sdnvpn_config_testcase4.yaml index 1e221354..1e221354 100644 --- a/userconfig/sdnvpn_config_testcase4.yaml +++ b/dovetail/userconfig/sdnvpn_config_testcase4.yaml diff --git a/userconfig/sdnvpn_config_testcase8.yaml b/dovetail/userconfig/sdnvpn_config_testcase8.yaml index c825997b..c825997b 100644 --- a/userconfig/sdnvpn_config_testcase8.yaml +++ b/dovetail/userconfig/sdnvpn_config_testcase8.yaml |