Code Review
/
ccsdk
/
apps.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Assign image keyname and pubkey at vnf level
[ccsdk/apps.git]
/
ms
/
controllerblueprints
/
application
/
load
/
blueprints
/
vFW
/
Templates
/
vpg.vtl
diff --git
a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vpg.vtl
b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vpg.vtl
index
c69aeb5
..
f7e3780
100644
(file)
--- a/
ms/controllerblueprints/application/load/blueprints/vFW/Templates/vpg.vtl
+++ b/
ms/controllerblueprints/application/load/blueprints/vFW/Templates/vpg.vtl
@@
-64,10
+64,6
@@
"param-name": "cloud_env",
"param-value": "openstack"
},
"param-name": "cloud_env",
"param-value": "openstack"
},
- {
- "param-name": "key_name",
- "param-value": "${nf-role}_key"
- },
{
"param-name": "repo_url_artifacts",
"param-value": "https://nexus.onap.org/content/groups/staging"
{
"param-name": "repo_url_artifacts",
"param-value": "https://nexus.onap.org/content/groups/staging"
@@
-82,12
+78,20
@@
},
{
"param-name": "image_name",
},
{
"param-name": "image_name",
- "param-value": "
Ubuntu 14.04 LTS Generic
"
+ "param-value": "
${image_name}
"
},
{
"param-name": "flavor_name",
"param-value": "m1.medium"
},
},
{
"param-name": "flavor_name",
"param-value": "m1.medium"
},
+ {
+ "param-name": "key_name",
+ "param-value": "${key_name}"
+ },
+ {
+ "param-name": "pub_key",
+ "param-value": "${pub_key}"
+ },
{
"param-name": "install_script_version",
"param-value": "1.2.1-SNAPSHOT"
{
"param-name": "install_script_version",
"param-value": "1.2.1-SNAPSHOT"
@@
-100,10
+104,6
@@
"param-name": "dcae_collector_ip",
"param-value": "10.0.4.1"
},
"param-name": "dcae_collector_ip",
"param-value": "10.0.4.1"
},
- {
- "param-name": "pub_key",
- "param-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
- },
{
"param-name": "public_net_id",
"param-value": "${public_net_id}"
{
"param-name": "public_net_id",
"param-value": "${public_net_id}"