AAF Sample CA change

[demo.git] / heat / ONAP / onap_openstack.yaml

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index eaec4f4..65fe4fd 100644 (file)
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -1245,6 +1245,7 @@ resources:
               __vm_flavor__: { get_param: flavor_medium }
               __public_net_id__: { get_param: public_net_id }
               __oam_network_id__: { get_resource: oam_onap }
+              __sec_group__: { get_resource: onap_sg }
               __script_version__: { get_param: artifacts_version }
               __docker_version__: { get_param: robot_docker }
               __sniro_docker_version__: { get_param: sniro_docker }
@@ -1299,6 +1300,7 @@ resources:
                 echo "__public_net_id__" > /opt/config/public_net_id.txt
               fi
               echo "__oam_network_id__" > /opt/config/oam_network_id.txt
+              echo "__sec_group__" > /opt/config/sec_group.txt
               echo "__use_oam_net_for_robot__" > /opt/config/use_oam_net_for_robot.txt
               echo "__vnf_pub_key__" > /opt/config/vnf_pub_key.txt
               echo "localhost" > /opt/config/log_elasticsearch_ip_addr.txt # these tests will be skipped by robot
@@ -2436,6 +2438,9 @@ resources:
         - path: /opt/aaf_vm_init.sh
           permissions: '0755'
           content: { get_file: cloud-config/aaf_vm_init.sh }
+        - path: /opt/config/sample_ca/aaf.signer.p12
+          permissions: '0600'
+          content: { get_file: cloud-config/sample_ca/aaf.signer.p12 }
         - path: /etc/init.d/serv.sh
           permissions: '0755'
           content:
@@ -2457,14 +2462,17 @@ resources:
               __docker_version__: { get_param: aaf_docker }
               __aaf_repo__: { get_param: aaf_repo }
               __gerrit_branch__: { get_param: aaf_branch }
+              __public_ip__: { get_attr: [aaf_floating_ip, floating_ip_address] }
               __local_ip__: { get_param: aaf_ip_addr }
             template: |
               #!/bin/bash
 
               # Create configuration files
+              mkdir -p /opt/config/sample_ca
               echo "__docker_version__" > /opt/config/docker_version.txt
               echo "__aaf_repo__" > /opt/config/remote_repo.txt
               echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+              echo "__public_ip__" > /opt/config/public_ip.txt
               echo "__local_ip__" > /opt/config/local_ip.txt
 
               cd /opt