Code Review
/
demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Change Other to OTHER
[demo.git]
/
tosca
/
vCPE
/
infra
/
MainServiceTemplate.yaml
diff --git
a/tosca/vCPE/infra/MainServiceTemplate.yaml
b/tosca/vCPE/infra/MainServiceTemplate.yaml
index
728cb21
..
b17d968
100644
(file)
--- a/
tosca/vCPE/infra/MainServiceTemplate.yaml
+++ b/
tosca/vCPE/infra/MainServiceTemplate.yaml
@@
-299,7
+299,7
@@
topology_template:
max_number_of_instances: 1
watchdog: none
inject_files: #TODO SDC Bug
max_number_of_instances: 1
watchdog: none
inject_files: #TODO SDC Bug
- source_path: ../Artifacts/Deployment/O
ther
/authorized_keys #SSH authorized_keys
+ source_path: ../Artifacts/Deployment/O
THER
/authorized_keys #SSH authorized_keys
dest_path: /home/ubuntu/.ssh/authorized_keys
meta_data:
vnf_id: { get_input: vnf_id }
dest_path: /home/ubuntu/.ssh/authorized_keys
meta_data:
vnf_id: { get_input: vnf_id }
@@
-359,7
+359,7
@@
topology_template:
artifacts:
sw_image: #TODO need to put glance image name here
#file: { get_input: vcpe_image_name }
artifacts:
sw_image: #TODO need to put glance image name here
#file: { get_input: vcpe_image_name }
- file: ../Artifacts/Deployment/O
ther
/image
+ file: ../Artifacts/Deployment/O
THER
/image
type: tosca.artifacts.nfv.SwImage
# vdns related
type: tosca.artifacts.nfv.SwImage
# vdns related
@@
-427,7
+427,7
@@
topology_template:
max_number_of_instances: 1
watchdog: none
inject_files: # TODO SDC Bug
max_number_of_instances: 1
watchdog: none
inject_files: # TODO SDC Bug
- source_path: ../Artifacts/Deployment/O
ther
/authorized_keys #SSH authorized_keys
+ source_path: ../Artifacts/Deployment/O
THER
/authorized_keys #SSH authorized_keys
dest_path: /home/ubuntu/.ssh/authorized_keys
meta_data:
vnf_id: { get_input: vnf_id }
dest_path: /home/ubuntu/.ssh/authorized_keys
meta_data:
vnf_id: { get_input: vnf_id }
@@
-483,7
+483,7
@@
topology_template:
artifacts:
sw_image: #TODO need to put glance image name here
#file: { get_input: vcpe_image_name }
artifacts:
sw_image: #TODO need to put glance image name here
#file: { get_input: vcpe_image_name }
- file: ../Artifacts/Deployment/O
ther
/image
+ file: ../Artifacts/Deployment/O
THER
/image
type: tosca.artifacts.nfv.SwImage
# vdhcp related
type: tosca.artifacts.nfv.SwImage
# vdhcp related
@@
-551,7
+551,7
@@
topology_template:
max_number_of_instances: 1
watchdog: none
inject_files: #SDC Bug
max_number_of_instances: 1
watchdog: none
inject_files: #SDC Bug
- source_path: ../Artifacts/Deployment/O
ther
/authorized_keys #SSH authorized_keys
+ source_path: ../Artifacts/Deployment/O
THER
/authorized_keys #SSH authorized_keys
dest_path: /home/ubuntu/.ssh/authorized_keys
meta_data:
vnf_id: { get_input: vnf_id }
dest_path: /home/ubuntu/.ssh/authorized_keys
meta_data:
vnf_id: { get_input: vnf_id }
@@
-611,7
+611,7
@@
topology_template:
artifacts:
sw_image: #TODO need to put glance image name here
#file: { get_input: vcpe_image_name }
artifacts:
sw_image: #TODO need to put glance image name here
#file: { get_input: vcpe_image_name }
- file: ../Artifacts/Deployment/O
ther
/image
+ file: ../Artifacts/Deployment/O
THER
/image
type: tosca.artifacts.nfv.SwImage
# vweb related
type: tosca.artifacts.nfv.SwImage
# vweb related
@@
-679,7
+679,7
@@
topology_template:
max_number_of_instances: 1
watchdog: none
inject_files: # TODO SDC bug
max_number_of_instances: 1
watchdog: none
inject_files: # TODO SDC bug
- source_path: ../Artifacts/Deployment/O
ther
/authorized_keys #SSH authorized_keys
+ source_path: ../Artifacts/Deployment/O
THER
/authorized_keys #SSH authorized_keys
dest_path: /home/ubuntu/.ssh/authorized_keys
meta_data:
vnf_id: { get_input: vnf_id }
dest_path: /home/ubuntu/.ssh/authorized_keys
meta_data:
vnf_id: { get_input: vnf_id }
@@
-735,6
+735,6
@@
topology_template:
artifacts:
sw_image: #TODO need to put glance image name here
#file: { get_input: vcpe_image_name }
artifacts:
sw_image: #TODO need to put glance image name here
#file: { get_input: vcpe_image_name }
- file: ../Artifacts/Deployment/O
ther
/image
+ file: ../Artifacts/Deployment/O
THER
/image
type: tosca.artifacts.nfv.SwImage
type: tosca.artifacts.nfv.SwImage