X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.yaml;h=267f67ea284dcc6f8f34e1f5d5a075c2d36e6670;hb=912776b9702662acac4fe4990ed5b2e1eb4be01e;hp=ddc5dd0e90cb3e4ac9b00062e3f50f5e20834306;hpb=f35a4829e267188df8064562d43de65351e6a7e9;p=demo.git diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index ddc5dd0e..267f67ea 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -1101,12 +1101,16 @@ resources: echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt + echo "__vm_image_name__" > /opt/config/vm_image_name.txt echo "__vm_flavor__" > /opt/config/vm_flavor.txt echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt echo "__script_version__" > /opt/config/script_version.txt echo "__public_net_id__" > /opt/config/public_net_id.txt echo "__robot_repo__" > /opt/config/remote_repo.txt + echo "localhost" > /opt/config/log_elasticsearch_ip_addr.txt # these tests will be skipped by robot + echo "localhost" > /opt/config/log_logstash_ip_addr.txt # these tests will be skipped by robot + echo "localhost" > /opt/config/log_kibana_ip_addr.txt # these tests will be skipped by robot # Download and run install script curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/robot_install.sh -o /opt/robot_install.sh @@ -1644,7 +1648,7 @@ resources: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } - flavor: { get_param: flavor_xxlarge } + flavor: { get_param: flavor_xlarge } name: str_replace: template: base-multi-service @@ -1786,7 +1790,7 @@ resources: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } - flavor: { get_param: flavor_large } + flavor: { get_param: flavor_xlarge } name: str_replace: template: base-dcae @@ -2152,6 +2156,7 @@ resources: __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } + __local_ip_addr__: { get_param: aaf_ip_addr } __docker_version__: { get_param: aaf_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } @@ -2169,6 +2174,7 @@ resources: echo "__nexus_password__" > /opt/config/nexus_password.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__local_ip_addr__" > /opt/config/local_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt