From 5c1e93c084aa0d2e7efbe8f18c87ee36fc2608cc Mon Sep 17 00:00:00 2001 From: Haibin Huang Date: Mon, 19 Nov 2018 10:29:58 +0000 Subject: Change Other to OTHER Change-Id: I5c4f26cc89000b58bf1468e54193887a170e27d7 Issue-ID: INT-743 Signed-off-by: Haibin Huang --- .../Artifacts/Deployment/OTHER/authorized_keys | 1 + tosca/vCPE/Artifacts/Deployment/OTHER/id_rsa | 27 ++++++++++++++++++++++ tosca/vCPE/Artifacts/Deployment/OTHER/id_rsa.pub | 1 + tosca/vCPE/Artifacts/Deployment/OTHER/image | 1 + .../Artifacts/Deployment/Other/authorized_keys | 1 - tosca/vCPE/Artifacts/Deployment/Other/id_rsa | 27 ---------------------- tosca/vCPE/Artifacts/Deployment/Other/id_rsa.pub | 1 - tosca/vCPE/Artifacts/Deployment/Other/image | 1 - tosca/vCPE/infra/MainServiceTemplate.yaml | 16 ++++++------- tosca/vCPE/infra/MainServiceTemplate_sriov.yaml | 16 ++++++------- tosca/vCPE/vbng/MainServiceTemplate.yaml | 4 ++-- tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml | 4 ++-- tosca/vCPE/vbrgemu/MainServiceTemplate.yaml | 4 ++-- tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml | 2 +- tosca/vCPE/vgmux/MainServiceTemplate.yaml | 4 ++-- tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml | 4 ++-- tosca/vCPE/vgw/MainServiceTemplate.yaml | 4 ++-- tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml | 4 ++-- 18 files changed, 61 insertions(+), 61 deletions(-) create mode 100644 tosca/vCPE/Artifacts/Deployment/OTHER/authorized_keys create mode 100644 tosca/vCPE/Artifacts/Deployment/OTHER/id_rsa create mode 100644 tosca/vCPE/Artifacts/Deployment/OTHER/id_rsa.pub create mode 100644 tosca/vCPE/Artifacts/Deployment/OTHER/image delete mode 100644 tosca/vCPE/Artifacts/Deployment/Other/authorized_keys delete mode 100644 tosca/vCPE/Artifacts/Deployment/Other/id_rsa delete mode 100644 tosca/vCPE/Artifacts/Deployment/Other/id_rsa.pub delete mode 100644 tosca/vCPE/Artifacts/Deployment/Other/image diff --git a/tosca/vCPE/Artifacts/Deployment/OTHER/authorized_keys b/tosca/vCPE/Artifacts/Deployment/OTHER/authorized_keys new file mode 100644 index 00000000..444ca79c --- /dev/null +++ b/tosca/vCPE/Artifacts/Deployment/OTHER/authorized_keys @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGx6SKrAuCz1V8KGevZueksLdWoPWJP6z3r29Z7TmPVEOjM+7PIPeSs2BVRx3rnHZBAlasMrZ+fJBS25ts9vfC+ItezQah/hr9vrkmwxCR54Lb84poW+sToPeF6i5eZY7W+jWJfLaFSFx9d2vp4zes/fOlT3NvYCXbn/3QdryQoGl7VFI8oemZypVcikZXElJeeKgAVdSwnrzuqtO/tmbXcAeSbYvVjki8ywYcsWMVMYWUWhh+1BAB6kXnTsIWqzrq0Pfvy+81WDwtiqsqmd93HY8hE0scBrXFBZzQS/AYfIFBlEuFNdLczchntjbZ0n7dmDXk8zHtCZYNk7kwb8k/ diff --git a/tosca/vCPE/Artifacts/Deployment/OTHER/id_rsa b/tosca/vCPE/Artifacts/Deployment/OTHER/id_rsa new file mode 100644 index 00000000..60597577 --- /dev/null +++ b/tosca/vCPE/Artifacts/Deployment/OTHER/id_rsa @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEAxsekiqwLgs9VfChnr2bnpLC3VqD1iT+s969vWe05j1RDozPu +zyD3krNgVUcd65x2QQJWrDK2fnyQUtubbPb3wviLXs0Gof4a/b65JsMQkeeC2/OK +aFvrE6D3heouXmWO1vo1iXy2hUhcfXdr6eM3rP3zpU9zb2Al25/90Ha8kKBpe1RS +PKHpmcqVXIpGVxJSXnioAFXUsJ687qrTv7Zm13AHkm2L1Y5IvMsGHLFjFTGFlFoY +ftQQAepF507CFqs66tD378vvNVg8LYqrKpnfdx2PIRNLHAa1xQWc0EvwGHyBQZRL +hTXS3M3IZ7Y22dJ+3Zg15PMx7QmWDZO5MG/JPwIDAQABAoIBAE5KS1AiutXmezDP +aSb4TLvcrhj8hDhuT92txxmQCV+ePJWG2sPRpDCvXX246NvnX9vy49gmkSH4RY+c +1vZvvt2XrqzD65zZzB+sgpf1tA0DNdMTdKvtqASvHU4tEd4z+bJKEdP4vpp4CZWQ +93vC9ia4TsIJLNns8Hwz42+7lEEResKYZA2djGnzHl+83vR1dm0GGBD6BKR1C3Cx +HbEhqx42EV61+8nAweQNjWKxeAc2hg+H8o8qWJM1aKy0TnqW6kudOYRyYIpX0rJA +siE2HwvDA1mDd5M8ntZ/Cx0pnTc/cuZB8BQJ0jN1JXbrJGbWspBNXformw7isbyO +WIOjvEECgYEA84XKV3aPrTE2JBs5vzzs59NMPV+5frw+xzDyPxqK5Q7+jjVKDwxh +/WRatCaTdRxhOI905HfVsDYjrsPOpmF9MHsLxmBhwk8zBFOu/xtYr7zBNkJhmCsq +kZMdxf8bpu08E7kMQJ2MvT7OhM5HRlWIUR0jdja8Hz51Ro4oOb/po7kCgYEA0Pb5 +v12ZsaSHMF0r4l983PifNwYmI22iQIEtRT2DxgTkDKgBTjbRzqZmEhaADMAO48o9 +sIZy+KJ/a8G9fPQVwMgBID8zOHnWsrFmM3qkj5hhrAQdtq7OE71zgaP0tyE1TG4u +Zs3a7eSyuoildHHFqX88oXSYsTlfV8vn23UpwLcCgYEAwXiCuBger8dQL0FeEJwz +zz5k7MG3WoPuEEzHuPC6dp8CCDM4IlqBI1JuaX/YWQtyBgCbKsQ2BigNE1THQhJj +5ndrdHCwWjKX4pElj9HHFN+OVTBJ3x40VLGfzuUNsAH8X+L9Y/yHivZyFrrXj352 +rZLL0KhNrzjs7WAVf0QEOCkCgYBe2s1xnZZnueyX+qMyBfBTChST0Jm9WUXejAS1 +un+3gn7Wc+jrzRyd9pC8wzPrFb9sjWBFYjKMRI8cpfxS3SWGtgM01Rt2FnBr+vUO +hyxt9ljX0aJ/S4hGE6h7/6XU/yEHibhMeENZ24d5/w9D9WUpVJV8IMYzJHzwCKI9 +z0hdrwKBgQDMKvY3DBpZjhZe9YnOgdj4SRpNwaasUSf3a3SZYY1JyOZVUzeSSzoX +rYLfxBRDjkJ8Nnod+nR/JSRqYa/SJYEMZEZFsC+k/pvBiaP6tk694IlpLD/2MXN6 +14FUV5LH/rGSbZJMSfZ9yNX1XZDowH8nOu+qlmlU4lmgiOuityTmtw== +-----END RSA PRIVATE KEY----- diff --git a/tosca/vCPE/Artifacts/Deployment/OTHER/id_rsa.pub b/tosca/vCPE/Artifacts/Deployment/OTHER/id_rsa.pub new file mode 100644 index 00000000..444ca79c --- /dev/null +++ b/tosca/vCPE/Artifacts/Deployment/OTHER/id_rsa.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGx6SKrAuCz1V8KGevZueksLdWoPWJP6z3r29Z7TmPVEOjM+7PIPeSs2BVRx3rnHZBAlasMrZ+fJBS25ts9vfC+ItezQah/hr9vrkmwxCR54Lb84poW+sToPeF6i5eZY7W+jWJfLaFSFx9d2vp4zes/fOlT3NvYCXbn/3QdryQoGl7VFI8oemZypVcikZXElJeeKgAVdSwnrzuqtO/tmbXcAeSbYvVjki8ywYcsWMVMYWUWhh+1BAB6kXnTsIWqzrq0Pfvy+81WDwtiqsqmd93HY8hE0scBrXFBZzQS/AYfIFBlEuFNdLczchntjbZ0n7dmDXk8zHtCZYNk7kwb8k/ diff --git a/tosca/vCPE/Artifacts/Deployment/OTHER/image b/tosca/vCPE/Artifacts/Deployment/OTHER/image new file mode 100644 index 00000000..f31d15df --- /dev/null +++ b/tosca/vCPE/Artifacts/Deployment/OTHER/image @@ -0,0 +1 @@ +ubuntu_16.04 diff --git a/tosca/vCPE/Artifacts/Deployment/Other/authorized_keys b/tosca/vCPE/Artifacts/Deployment/Other/authorized_keys deleted file mode 100644 index 444ca79c..00000000 --- a/tosca/vCPE/Artifacts/Deployment/Other/authorized_keys +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGx6SKrAuCz1V8KGevZueksLdWoPWJP6z3r29Z7TmPVEOjM+7PIPeSs2BVRx3rnHZBAlasMrZ+fJBS25ts9vfC+ItezQah/hr9vrkmwxCR54Lb84poW+sToPeF6i5eZY7W+jWJfLaFSFx9d2vp4zes/fOlT3NvYCXbn/3QdryQoGl7VFI8oemZypVcikZXElJeeKgAVdSwnrzuqtO/tmbXcAeSbYvVjki8ywYcsWMVMYWUWhh+1BAB6kXnTsIWqzrq0Pfvy+81WDwtiqsqmd93HY8hE0scBrXFBZzQS/AYfIFBlEuFNdLczchntjbZ0n7dmDXk8zHtCZYNk7kwb8k/ diff --git a/tosca/vCPE/Artifacts/Deployment/Other/id_rsa b/tosca/vCPE/Artifacts/Deployment/Other/id_rsa deleted file mode 100644 index 60597577..00000000 --- a/tosca/vCPE/Artifacts/Deployment/Other/id_rsa +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAxsekiqwLgs9VfChnr2bnpLC3VqD1iT+s969vWe05j1RDozPu -zyD3krNgVUcd65x2QQJWrDK2fnyQUtubbPb3wviLXs0Gof4a/b65JsMQkeeC2/OK -aFvrE6D3heouXmWO1vo1iXy2hUhcfXdr6eM3rP3zpU9zb2Al25/90Ha8kKBpe1RS -PKHpmcqVXIpGVxJSXnioAFXUsJ687qrTv7Zm13AHkm2L1Y5IvMsGHLFjFTGFlFoY -ftQQAepF507CFqs66tD378vvNVg8LYqrKpnfdx2PIRNLHAa1xQWc0EvwGHyBQZRL -hTXS3M3IZ7Y22dJ+3Zg15PMx7QmWDZO5MG/JPwIDAQABAoIBAE5KS1AiutXmezDP -aSb4TLvcrhj8hDhuT92txxmQCV+ePJWG2sPRpDCvXX246NvnX9vy49gmkSH4RY+c -1vZvvt2XrqzD65zZzB+sgpf1tA0DNdMTdKvtqASvHU4tEd4z+bJKEdP4vpp4CZWQ -93vC9ia4TsIJLNns8Hwz42+7lEEResKYZA2djGnzHl+83vR1dm0GGBD6BKR1C3Cx -HbEhqx42EV61+8nAweQNjWKxeAc2hg+H8o8qWJM1aKy0TnqW6kudOYRyYIpX0rJA -siE2HwvDA1mDd5M8ntZ/Cx0pnTc/cuZB8BQJ0jN1JXbrJGbWspBNXformw7isbyO -WIOjvEECgYEA84XKV3aPrTE2JBs5vzzs59NMPV+5frw+xzDyPxqK5Q7+jjVKDwxh -/WRatCaTdRxhOI905HfVsDYjrsPOpmF9MHsLxmBhwk8zBFOu/xtYr7zBNkJhmCsq -kZMdxf8bpu08E7kMQJ2MvT7OhM5HRlWIUR0jdja8Hz51Ro4oOb/po7kCgYEA0Pb5 -v12ZsaSHMF0r4l983PifNwYmI22iQIEtRT2DxgTkDKgBTjbRzqZmEhaADMAO48o9 -sIZy+KJ/a8G9fPQVwMgBID8zOHnWsrFmM3qkj5hhrAQdtq7OE71zgaP0tyE1TG4u -Zs3a7eSyuoildHHFqX88oXSYsTlfV8vn23UpwLcCgYEAwXiCuBger8dQL0FeEJwz -zz5k7MG3WoPuEEzHuPC6dp8CCDM4IlqBI1JuaX/YWQtyBgCbKsQ2BigNE1THQhJj -5ndrdHCwWjKX4pElj9HHFN+OVTBJ3x40VLGfzuUNsAH8X+L9Y/yHivZyFrrXj352 -rZLL0KhNrzjs7WAVf0QEOCkCgYBe2s1xnZZnueyX+qMyBfBTChST0Jm9WUXejAS1 -un+3gn7Wc+jrzRyd9pC8wzPrFb9sjWBFYjKMRI8cpfxS3SWGtgM01Rt2FnBr+vUO -hyxt9ljX0aJ/S4hGE6h7/6XU/yEHibhMeENZ24d5/w9D9WUpVJV8IMYzJHzwCKI9 -z0hdrwKBgQDMKvY3DBpZjhZe9YnOgdj4SRpNwaasUSf3a3SZYY1JyOZVUzeSSzoX -rYLfxBRDjkJ8Nnod+nR/JSRqYa/SJYEMZEZFsC+k/pvBiaP6tk694IlpLD/2MXN6 -14FUV5LH/rGSbZJMSfZ9yNX1XZDowH8nOu+qlmlU4lmgiOuityTmtw== ------END RSA PRIVATE KEY----- diff --git a/tosca/vCPE/Artifacts/Deployment/Other/id_rsa.pub b/tosca/vCPE/Artifacts/Deployment/Other/id_rsa.pub deleted file mode 100644 index 444ca79c..00000000 --- a/tosca/vCPE/Artifacts/Deployment/Other/id_rsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGx6SKrAuCz1V8KGevZueksLdWoPWJP6z3r29Z7TmPVEOjM+7PIPeSs2BVRx3rnHZBAlasMrZ+fJBS25ts9vfC+ItezQah/hr9vrkmwxCR54Lb84poW+sToPeF6i5eZY7W+jWJfLaFSFx9d2vp4zes/fOlT3NvYCXbn/3QdryQoGl7VFI8oemZypVcikZXElJeeKgAVdSwnrzuqtO/tmbXcAeSbYvVjki8ywYcsWMVMYWUWhh+1BAB6kXnTsIWqzrq0Pfvy+81WDwtiqsqmd93HY8hE0scBrXFBZzQS/AYfIFBlEuFNdLczchntjbZ0n7dmDXk8zHtCZYNk7kwb8k/ diff --git a/tosca/vCPE/Artifacts/Deployment/Other/image b/tosca/vCPE/Artifacts/Deployment/Other/image deleted file mode 100644 index f31d15df..00000000 --- a/tosca/vCPE/Artifacts/Deployment/Other/image +++ /dev/null @@ -1 +0,0 @@ -ubuntu_16.04 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 -- cgit 1.2.3-korg