X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tosca%2FvCPE%2Finfra%2Fbase_vcpe_infra_rackspace_tosca.yaml;fp=tosca%2FvCPE%2Finfra%2Fbase_vcpe_infra_rackspace_tosca.yaml;h=6555e920366e6f9f9ee61e2624cdfee4955020c0;hb=676591091ff3c154193213b26103c694f1a5f1be;hp=de9eaebf288ce9958810d86154bc4d1559237328;hpb=314c0c1e45bc6a4c1ae0e7c030ebbf51b80abb35;p=demo.git

diff --git a/tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml b/tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml
index de9eaebf..6555e920 100644
--- a/tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml
+++ b/tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml
@@ -205,25 +205,25 @@ topology_template:
         server:
           metadata: {vnf_id: { get_input: vnf_id }, vf_module_id: { get_input: vf_module_id }}
           userdata: { concat: [
-                              "#!/bin/bash\n",
-                              "mkdir /opt/config\n",
-                              "echo ", { get_input: dcae_collector_ip}, " > /opt/config/dcae_collector_ip.txt\n",
-                              "echo ", { get_input: dcae_collector_port}, " > /opt/config/dcae_collector_port.txt\n",
-                              "echo ", { get_input: vaaa_private_ip_0}, " > /opt/config/cpe_signal_net_ipaddr.txt\n",
-                              "echo ", { get_input: vaaa_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n",
-                              "echo ", { get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n",
-                              "echo ", { get_input: cpe_signal_net_cidr}, " > /opt/config/cpe_signal_net_cidr.txt\n",
-                              "echo ", { get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n",
-                              "echo ", { get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n",
-                              "echo ", { get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n",
-                              "echo ", { get_input: install_script_version}, " > /opt/config/install_script_version.txt\n",
-                              "echo ", { get_input: cloud_env}, " > /opt/config/cloud_env.txt\n",
-                              "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_aaa_install.sh -o /opt/v_aaa_install.sh\n",
-                              "cd /opt\n",
-                              "chmod +x v_aaa_install.sh\n",
-                              "./v_aaa_install.sh\n"
-                            ]
-                   }
+            "#!/bin/bash\n",
+            "mkdir /opt/config\n",
+            "echo ", { get_input: dcae_collector_ip}, " > /opt/config/dcae_collector_ip.txt\n",
+            "echo ", { get_input: dcae_collector_port}, " > /opt/config/dcae_collector_port.txt\n",
+            "echo ", { get_input: vaaa_private_ip_0}, " > /opt/config/cpe_signal_net_ipaddr.txt\n",
+            "echo ", { get_input: vaaa_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n",
+            "echo ", { get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n",
+            "echo ", { get_input: cpe_signal_net_cidr}, " > /opt/config/cpe_signal_net_cidr.txt\n",
+            "echo ", { get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n",
+            "echo ", { get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n",
+            "echo ", { get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n",
+            "echo ", { get_input: install_script_version}, " > /opt/config/install_script_version.txt\n",
+            "echo ", { get_input: cloud_env}, " > /opt/config/cloud_env.txt\n",
+            "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_aaa_install.sh -o /opt/v_aaa_install.sh\n",
+            "cd /opt\n",
+            "chmod +x v_aaa_install.sh\n",
+            "./v_aaa_install.sh\n"
+          ]
+          }
       requirements:
         - key_pair: my_keypair
         - port: vaaa_private_0_port
@@ -257,23 +257,23 @@ topology_template:
         server:
           metadata: {vnf_id: { get_input: vnf_id }, vf_module_id: { get_input: vf_module_id }}
           userdata: { concat: [
-                              "#!/bin/bash\n",
-                              "mkdir /opt/config\n",
-                              "echo ", {get_input: vdns_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n",
-                              "echo ", {get_input: vdns_private_ip_0}, " > /opt/config/cpe_public_net_ipaddr.txt\n",
-                              "echo ", {get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n",
-                              "echo ", {get_input: cpe_public_net_cidr}, " > /opt/config/cpe_public_net_cidr.txt\n",
-                              "echo ", {get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n",
-                              "echo ", {get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n",
-                              "echo ", {get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n",
-                              "echo ", {get_input: install_script_version}, " > /opt/config/install_script_version.txt\n",
-                              "echo ", {get_input: cloud_env}, " > /opt/config/cloud_env.txt\n",
-                              "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_dns_install.sh -o /opt/v_dns_install.sh\n",
-                              "cd /opt\n",
-                              "chmod +x v_dns_install.sh\n",
-                              "./v_dns_install.sh\n"
-                            ]
-                   }
+            "#!/bin/bash\n",
+            "mkdir /opt/config\n",
+            "echo ", {get_input: vdns_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n",
+            "echo ", {get_input: vdns_private_ip_0}, " > /opt/config/cpe_public_net_ipaddr.txt\n",
+            "echo ", {get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n",
+            "echo ", {get_input: cpe_public_net_cidr}, " > /opt/config/cpe_public_net_cidr.txt\n",
+            "echo ", {get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n",
+            "echo ", {get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n",
+            "echo ", {get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n",
+            "echo ", {get_input: install_script_version}, " > /opt/config/install_script_version.txt\n",
+            "echo ", {get_input: cloud_env}, " > /opt/config/cloud_env.txt\n",
+            "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_dns_install.sh -o /opt/v_dns_install.sh\n",
+            "cd /opt\n",
+            "chmod +x v_dns_install.sh\n",
+            "./v_dns_install.sh\n"
+          ]
+          }
       requirements:
         - port: vdns_private_0_port
         - port: vdns_private_1_port
@@ -307,23 +307,23 @@ topology_template:
         server:
           metadata: {vnf_id: { get_input: vnf_id }, vf_module_id: { get_input: vf_module_id }}
           userdata: { concat: [
-                              "#!/bin/bash\n",
-                              "mkdir /opt/config\n",
-                              "echo ", {get_input: vdns_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n",
-                              "echo ", {get_input: vdhcp_private_ip_0}, " > /opt/config/cpe_signal_ipaddr.txt\n",
-                              "echo ", {get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n",
-                              "echo ", {get_input: cpe_signal_net_cidr}, " > /opt/config/cpe_signal_net_cidr.txt\n",
-                              "echo ", {get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n",
-                              "echo ", {get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n",
-                              "echo ", {get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n",
-                              "echo ", {get_input: install_script_version}, " > /opt/config/install_script_version.txt\n",
-                              "echo ", {get_input: cloud_env}, " > /opt/config/cloud_env.txt\n",
-                              "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_dhcp_install.sh -o /opt/v_dhcp_install.sh\n",
-                              "cd /opt\n",
-                              "chmod +x v_dhcp_install.sh\n",
-                              "./v_dhcp_install.sh\n"
-                            ]
-                    }
+            "#!/bin/bash\n",
+            "mkdir /opt/config\n",
+            "echo ", {get_input: vdns_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n",
+            "echo ", {get_input: vdhcp_private_ip_0}, " > /opt/config/cpe_signal_ipaddr.txt\n",
+            "echo ", {get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n",
+            "echo ", {get_input: cpe_signal_net_cidr}, " > /opt/config/cpe_signal_net_cidr.txt\n",
+            "echo ", {get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n",
+            "echo ", {get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n",
+            "echo ", {get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n",
+            "echo ", {get_input: install_script_version}, " > /opt/config/install_script_version.txt\n",
+            "echo ", {get_input: cloud_env}, " > /opt/config/cloud_env.txt\n",
+            "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_dhcp_install.sh -o /opt/v_dhcp_install.sh\n",
+            "cd /opt\n",
+            "chmod +x v_dhcp_install.sh\n",
+            "./v_dhcp_install.sh\n"
+          ]
+          }
       requirements:
         - key_pair: my_keypair
         - port: vdhcp_private_0_port
@@ -359,23 +359,23 @@ topology_template:
         server:
           metadata: {vnf_id: { get_input: vnf_id }, vf_module_id: { get_input: vf_module_id }}
           userdata: { concat: [
-                               "#!/bin/bash\n",
-                               "mkdir /opt/config\n",
-                               "echo ", {get_input: vweb_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n",
-                               "echo ", {get_input: vweb_private_ip_0}, " > /opt/config/cpe_public_ipaddr.txt\n",
-                               "echo ", {get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n",
-                               "echo ", {get_input: cpe_public_net_cidr}, " > /opt/config/cpe_public_net_cidr.txt\n",
-                               "echo ", {get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n",
-                               "echo ", {get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n",
-                               "echo ", {get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n",
-                               "echo ", {get_input: install_script_version}, " > /opt/config/install_script_version.txt\n",
-                               "echo ", {get_input: cloud_env}, " > /opt/config/cloud_env.txt\n",
-                               "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_web_install.sh -o /opt/v_web_install.sh\n",
-                               "cd /opt\n",
-                               "chmod +x v_web_install.sh\n",
-                               "./v_web_install.sh\n"
-                            ]
-                  }
+            "#!/bin/bash\n",
+            "mkdir /opt/config\n",
+            "echo ", {get_input: vweb_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n",
+            "echo ", {get_input: vweb_private_ip_0}, " > /opt/config/cpe_public_ipaddr.txt\n",
+            "echo ", {get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n",
+            "echo ", {get_input: cpe_public_net_cidr}, " > /opt/config/cpe_public_net_cidr.txt\n",
+            "echo ", {get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n",
+            "echo ", {get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n",
+            "echo ", {get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n",
+            "echo ", {get_input: install_script_version}, " > /opt/config/install_script_version.txt\n",
+            "echo ", {get_input: cloud_env}, " > /opt/config/cloud_env.txt\n",
+            "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_web_install.sh -o /opt/v_web_install.sh\n",
+            "cd /opt\n",
+            "chmod +x v_web_install.sh\n",
+            "./v_web_install.sh\n"
+          ]
+          }
       requirements:
         - key_pair: my_keypair
         - port: vweb_private_0_port