diff options
| -rw-r--r-- | boot/sdc_vm_init.sh | 8 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/boot/sdc_vm_init.sh b/boot/sdc_vm_init.sh index 42be1ffa..9626a2ee 100644 --- a/boot/sdc_vm_init.sh +++ b/boot/sdc_vm_init.sh @@ -3,7 +3,6 @@ NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) -NEXUS_DOCKER_PORT=$(echo $NEXUS_DOCKER_REPO | cut -d':' -f2) ENV_NAME=$(cat /opt/config/env_name.txt) MR_IP_ADDR=$(cat /opt/config/mr_ip_addr.txt) RELEASE=$(cat /opt/config/docker_version.txt) @@ -18,12 +17,7 @@ cp sdc/sdc-os-chef/scripts/docker_health.sh /data/scripts chmod +x /data/scripts/docker_run.sh chmod +x /data/scripts/docker_health.sh -if [ -e /opt/config/public_ip.txt ] -then - IP_ADDRESS=$(cat /opt/config/public_ip.txt) -else - IP_ADDRESS=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2) -fi +IP_ADDRESS=$(cat /opt/config/private_ip.txt) cat /data/environments/Template.json | sed "s/yyy/"$IP_ADDRESS"/g" > /data/environments/$ENV_NAME.json sed -i "s/xxx/"$ENV_NAME"/g" /data/environments/$ENV_NAME.json diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 3201e7b9..e916b5dd 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -1126,7 +1126,7 @@ resources: __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } - __public_ip__: { get_attr: [sdc_floating_ip, floating_ip_address] } + __private_ip__: { get_param: sdc_ip_addr } __docker_version__: { get_param: sdc_docker } __gerrit_branch__: { get_param: sdc_branch } __cloud_env__: { get_param: cloud_env } @@ -1143,7 +1143,7 @@ resources: echo "__nexus_password__" > /opt/config/nexus_password.txt echo "__env_name__" > /opt/config/env_name.txt echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt - echo "__public_ip__" > /opt/config/public_ip.txt + echo "__private_ip__" > /opt/config/private_ip.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt |