diff options
14 files changed, 31 insertions, 31 deletions
diff --git a/tosca/vCPE/Artifacts/Deployment/Other/authorized_keys b/tosca/vCPE/Artifacts/Deployment/OTHER/authorized_keys index 444ca79c..444ca79c 100644 --- a/tosca/vCPE/Artifacts/Deployment/Other/authorized_keys +++ b/tosca/vCPE/Artifacts/Deployment/OTHER/authorized_keys diff --git a/tosca/vCPE/Artifacts/Deployment/Other/id_rsa b/tosca/vCPE/Artifacts/Deployment/OTHER/id_rsa index 60597577..60597577 100644 --- a/tosca/vCPE/Artifacts/Deployment/Other/id_rsa +++ b/tosca/vCPE/Artifacts/Deployment/OTHER/id_rsa diff --git a/tosca/vCPE/Artifacts/Deployment/Other/id_rsa.pub b/tosca/vCPE/Artifacts/Deployment/OTHER/id_rsa.pub index 444ca79c..444ca79c 100644 --- a/tosca/vCPE/Artifacts/Deployment/Other/id_rsa.pub +++ b/tosca/vCPE/Artifacts/Deployment/OTHER/id_rsa.pub diff --git a/tosca/vCPE/Artifacts/Deployment/Other/image b/tosca/vCPE/Artifacts/Deployment/OTHER/image index f31d15df..f31d15df 100644 --- a/tosca/vCPE/Artifacts/Deployment/Other/image +++ b/tosca/vCPE/Artifacts/Deployment/OTHER/image diff --git a/tosca/vCPE/infra/MainServiceTemplate.yaml b/tosca/vCPE/infra/MainServiceTemplate.yaml index 728cb21a..b17d968e 100644 --- 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 - source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys + source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys 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 } - file: ../Artifacts/Deployment/Other/image + file: ../Artifacts/Deployment/OTHER/image 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 - source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys + source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys 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 } - file: ../Artifacts/Deployment/Other/image + file: ../Artifacts/Deployment/OTHER/image type: tosca.artifacts.nfv.SwImage # vdhcp related @@ -551,7 +551,7 @@ topology_template: max_number_of_instances: 1 watchdog: none inject_files: #SDC Bug - source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys + source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys 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 } - file: ../Artifacts/Deployment/Other/image + file: ../Artifacts/Deployment/OTHER/image 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 - source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys + source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys 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 } - file: ../Artifacts/Deployment/Other/image + file: ../Artifacts/Deployment/OTHER/image type: tosca.artifacts.nfv.SwImage diff --git a/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml b/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml index b362d4c2..7efb0956 100644 --- a/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml +++ b/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml @@ -298,7 +298,7 @@ topology_template: max_number_of_instances: 1 watchdog: none inject_files: #TODO SDC Bug - source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys + source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys dest_path: /home/ubuntu/.ssh/authorized_keys meta_data: vnf_id: { get_input: vnf_id } @@ -358,7 +358,7 @@ topology_template: artifacts: sw_image: #TODO need to put glance image name here #file: { get_input: vcpe_image_name } - file: ../Artifacts/Deployment/Other/image + file: ../Artifacts/Deployment/OTHER/image type: tosca.artifacts.nfv.SwImage # vdns related @@ -426,7 +426,7 @@ topology_template: max_number_of_instances: 1 watchdog: none inject_files: # TODO SDC Bug - source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys + source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys dest_path: /home/ubuntu/.ssh/authorized_keys meta_data: vnf_id: { get_input: vnf_id } @@ -482,7 +482,7 @@ topology_template: artifacts: sw_image: #TODO need to put glance image name here #file: { get_input: vcpe_image_name } - file: ../Artifacts/Deployment/Other/image + file: ../Artifacts/Deployment/OTHER/image type: tosca.artifacts.nfv.SwImage # vdhcp related @@ -550,7 +550,7 @@ topology_template: max_number_of_instances: 1 watchdog: none inject_files: #SDC Bug - source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys + source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys dest_path: /home/ubuntu/.ssh/authorized_keys meta_data: vnf_id: { get_input: vnf_id } @@ -610,7 +610,7 @@ topology_template: artifacts: sw_image: #TODO need to put glance image name here #file: { get_input: vcpe_image_name } - file: ../Artifacts/Deployment/Other/image + file: ../Artifacts/Deployment/OTHER/image type: tosca.artifacts.nfv.SwImage # vweb related @@ -678,7 +678,7 @@ topology_template: max_number_of_instances: 1 watchdog: none inject_files: # TODO SDC bug - source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys + source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys dest_path: /home/ubuntu/.ssh/authorized_keys meta_data: vnf_id: { get_input: vnf_id } @@ -734,6 +734,6 @@ topology_template: artifacts: sw_image: #TODO need to put glance image name here #file: { get_input: vcpe_image_name } - file: ../Artifacts/Deployment/Other/image + file: ../Artifacts/Deployment/OTHER/image type: tosca.artifacts.nfv.SwImage diff --git a/tosca/vCPE/vbng/MainServiceTemplate.yaml b/tosca/vCPE/vbng/MainServiceTemplate.yaml index a4666149..03c9adc6 100644 --- a/tosca/vCPE/vbng/MainServiceTemplate.yaml +++ b/tosca/vCPE/vbng/MainServiceTemplate.yaml @@ -333,7 +333,7 @@ topology_template: max_number_of_instances: 1 watchdog: none inject_files: #TODO SDC bug - source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys + source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys dest_path: /home/ubuntu/.ssh/authorized_keys meta_data: vnf_id: { get_input: vnf_id } @@ -408,5 +408,5 @@ topology_template: artifacts: sw_image: #TODO need to put glance image name here #file: { get_input: vcpe_image_name } - file: ../Artifacts/Deployment/Other/image + file: ../Artifacts/Deployment/OTHER/image type: tosca.artifacts.nfv.SwImage diff --git a/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml index cc81addf..86548bc6 100644 --- a/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml +++ b/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml @@ -343,7 +343,7 @@ topology_template: max_number_of_instances: 1 watchdog: none inject_files: #TODO SDC bug - source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys + source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys dest_path: /home/ubuntu/.ssh/authorized_keys meta_data: vnf_id: { get_input: vnf_id } @@ -418,5 +418,5 @@ topology_template: artifacts: sw_image: #TODO need to put glance image name here #file: { get_input: vcpe_image_name } - file: ../Artifacts/Deployment/Other/image + file: ../Artifacts/Deployment/OTHER/image type: tosca.artifacts.nfv.SwImage diff --git a/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml b/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml index 3f132b2b..ba6a14ec 100644 --- a/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml +++ b/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml @@ -206,7 +206,7 @@ topology_template: max_number_of_instances: 1 watchdog: none inject_files: #TODO SDC bug - source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys + source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys dest_path: /home/ubuntu/.ssh/authorized_keys meta_data: vnf_id: { get_input: vnf_id } @@ -262,5 +262,5 @@ topology_template: artifacts: sw_image: #TODO need to put glance image name here #file: { get_input: vcpe_image_name } - file: ../Artifacts/Deployment/Other/image + file: ../Artifacts/Deployment/OTHER/image type: tosca.artifacts.nfv.SwImage diff --git a/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml index 241ace07..60161908 100644 --- a/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml +++ b/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml @@ -265,5 +265,5 @@ topology_template: artifacts: sw_image: #TODO need to put glance image name here #file: { get_input: vcpe_image_name } - file: ../Artifacts/Deployment/Other/image + file: ../Artifacts/Deployment/OTHER/image type: tosca.artifacts.nfv.SwImage diff --git a/tosca/vCPE/vgmux/MainServiceTemplate.yaml b/tosca/vCPE/vgmux/MainServiceTemplate.yaml index b028db5f..10e2c08f 100644 --- a/tosca/vCPE/vgmux/MainServiceTemplate.yaml +++ b/tosca/vCPE/vgmux/MainServiceTemplate.yaml @@ -286,7 +286,7 @@ topology_template: max_number_of_instances: 1 watchdog: none inject_files: #TODO SDC bug - source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys + source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys dest_path: /home/ubuntu/.ssh/authorized_keys meta_data: vnf_id: { get_input: vnf_id } @@ -352,6 +352,6 @@ topology_template: artifacts: sw_image: #TODO need to put glance image name here #file: { get_input: vcpe_image_name } - file: ../Artifacts/Deployment/Other/image + file: ../Artifacts/Deployment/OTHER/image type: tosca.artifacts.nfv.SwImage diff --git a/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml index 392f1051..0f9dcd7c 100644 --- a/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml +++ b/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml @@ -297,7 +297,7 @@ topology_template: max_number_of_instances: 1 watchdog: none inject_files: #TODO SDC bug - source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys + source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys dest_path: /home/ubuntu/.ssh/authorized_keys meta_data: vnf_id: { get_input: vnf_id } @@ -363,6 +363,6 @@ topology_template: artifacts: sw_image: #TODO need to put glance image name here #file: { get_input: vcpe_image_name } - file: ../Artifacts/Deployment/Other/image + file: ../Artifacts/Deployment/OTHER/image type: tosca.artifacts.nfv.SwImage diff --git a/tosca/vCPE/vgw/MainServiceTemplate.yaml b/tosca/vCPE/vgw/MainServiceTemplate.yaml index 4925f388..fa9f29da 100644 --- a/tosca/vCPE/vgw/MainServiceTemplate.yaml +++ b/tosca/vCPE/vgw/MainServiceTemplate.yaml @@ -284,7 +284,7 @@ topology_template: max_number_of_instances: 1 watchdog: none inject_files: # TODO SDC BUG - source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys + source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys dest_path: /home/ubuntu/.ssh/authorized_keys meta_data: vnf_id: { get_input: vnf_id } @@ -349,5 +349,5 @@ topology_template: artifacts: sw_image: #TODO need to put glance image name here #file: { get_input: vcpe_image_name } - file: ../Artifacts/Deployment/Other/image + file: ../Artifacts/Deployment/OTHER/image type: tosca.artifacts.nfv.SwImage diff --git a/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml index 804e2c4b..b0bc0133 100644 --- a/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml +++ b/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml @@ -286,7 +286,7 @@ topology_template: max_number_of_instances: 1 watchdog: none inject_files: # TODO SDC BUG - source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys + source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys dest_path: /home/ubuntu/.ssh/authorized_keys meta_data: vnf_id: { get_input: vnf_id } @@ -351,5 +351,5 @@ topology_template: artifacts: sw_image: #TODO need to put glance image name here #file: { get_input: vcpe_image_name } - file: ../Artifacts/Deployment/Other/image + file: ../Artifacts/Deployment/OTHER/image type: tosca.artifacts.nfv.SwImage |