From 7ffc784e98f5f608000d1deff778e5aa1496a4fc Mon Sep 17 00:00:00 2001 From: platania Date: Tue, 7 Mar 2017 15:29:33 -0500 Subject: Update structure of POM files Change-Id: I24ceb375aa3c89b311fb0a0e1b40f8e8ae719343 Signed-off-by: platania --- boot/asdc_vm_init.sh | 5 +- heat/OpenECOMP/openecomp_rackspace.yaml | 1 + pom.xml | 2 +- vnfs/.DS_Store | Bin 10244 -> 10244 bytes vnfs/honeycomb_plugin/.DS_Store | Bin 6148 -> 6148 bytes .../sample_plugin/parent-pom/pom.xml | 7 +- vnfs/honeycomb_plugin/sample_plugin/pom.xml | 73 --------------------- .../sample_plugin/sample-distribution/pom.xml | 5 +- .../sample_plugin/sample-plugin-api/pom.xml | 3 - .../sample_plugin/sample-plugin-impl/pom.xml | 5 +- 10 files changed, 13 insertions(+), 88 deletions(-) delete mode 100755 vnfs/honeycomb_plugin/sample_plugin/pom.xml diff --git a/boot/asdc_vm_init.sh b/boot/asdc_vm_init.sh index 024120db..48f12905 100644 --- a/boot/asdc_vm_init.sh +++ b/boot/asdc_vm_init.sh @@ -5,6 +5,7 @@ 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=latest cd /opt/sdc @@ -20,8 +21,8 @@ chmod +x /data/scripts/docker_health.sh IP_ADDRESS=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2) 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 -sed -i "s/\"ueb_url_list\":.*/\"ueb_url_list\": \"10.0.11.1,10.0.11.1\",/g" /data/environments/$ENV_NAME.json -sed -i "s/\"fqdn\":.*/\"fqdn\": [\"10.0.11.1\", \"10.0.11.1\"]/g" /data/environments/$ENV_NAME.json +sed -i "s/\"ueb_url_list\":.*/\"ueb_url_list\": \""$MR_IP_ADDR","$MR_IP_ADDR"\",/g" /data/environments/$ENV_NAME.json +sed -i "s/\"fqdn\":.*/\"fqdn\": [\""$MR_IP_ADDR"\", \""$MR_IP_ADDR"\"]/g" /data/environments/$ENV_NAME.json docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO bash /data/scripts/docker_run.sh -e $ENV_NAME -r $RELEASE -p $NEXUS_DOCKER_PORT diff --git a/heat/OpenECOMP/openecomp_rackspace.yaml b/heat/OpenECOMP/openecomp_rackspace.yaml index d255f5da..f5431276 100644 --- a/heat/OpenECOMP/openecomp_rackspace.yaml +++ b/heat/OpenECOMP/openecomp_rackspace.yaml @@ -790,6 +790,7 @@ resources: echo "__gitlab_username__" > /opt/config/gitlab_username.txt echo "__gitlab_password__" > /opt/config/gitlab_password.txt echo "__env_name__" > /opt/config/env_name.txt + echo "10.0.11.1" > /opt/config/mr_ip_addr.txt # Run SDC-specific instructions cd /opt diff --git a/pom.xml b/pom.xml index 29fb83be..bce268fb 100755 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ - vnfs/honeycomb_plugin/sample_plugin + vnfs/honeycomb_plugin/sample_plugin/parent-pom vnfs/vFW/pg_streams vnfs/vLB/dns_streams vnfs/vLB/DNSClient diff --git a/vnfs/.DS_Store b/vnfs/.DS_Store index 42fd5df9..1515c79e 100644 Binary files a/vnfs/.DS_Store and b/vnfs/.DS_Store differ diff --git a/vnfs/honeycomb_plugin/.DS_Store b/vnfs/honeycomb_plugin/.DS_Store index 8ae4e662..8ab6e0a2 100644 Binary files a/vnfs/honeycomb_plugin/.DS_Store and b/vnfs/honeycomb_plugin/.DS_Store differ diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml index e089e713..589a0a2e 100644 --- a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml +++ b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml @@ -65,6 +65,12 @@ done pom + + ../sample-plugin-api + ../sample-plugin-impl + ../sample-distribution + + @@ -239,7 +245,6 @@ done true - diff --git a/vnfs/honeycomb_plugin/sample_plugin/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/pom.xml deleted file mode 100755 index 502fdf81..00000000 --- a/vnfs/honeycomb_plugin/sample_plugin/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - org.opendaylight.odlparent - odlparent - 1.6.2-Beryllium-SR2 - - - org.openecomp.demo.vnf - sample-plugin-aggregator - 1.0.0-SNAPSHOT - sample-plugin-aggregator - pom - 4.0.0 - - 3.1.1 - - - - sample-plugin-api - sample-plugin-impl - sample-distribution - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - org.codehaus.mojo - exec-maven-plugin - - - none - - - - true - - - - - - - diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml index 07261c81..9d01b41e 100755 --- a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml +++ b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml @@ -5,13 +5,10 @@ io.fd.honeycomb.common minimal-distribution-parent 1.16.9 -../parent-pom/pom.xml 4.0.0 - org.openecomp.demo.vnf sample-distribution - 1.0.0-SNAPSHOT io.fd.honeycomb.vpp.integration.distro.Main @@ -85,7 +82,7 @@ org.openecomp.demo.vnf sample-plugin-impl - 1.0.0-SNAPSHOT + latest diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml index 77a4b4fd..c89f3118 100755 --- a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml +++ b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml @@ -17,13 +17,10 @@ io.fd.honeycomb.common api-parent 1.16.9 - ../../common/api-parent 4.0.0 - org.openecomp.demo.vnf sample-plugin-api - 1.0.0-SNAPSHOT bundle diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml index 6113ecd3..ad61616d 100755 --- a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml +++ b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml @@ -17,13 +17,10 @@ io.fd.honeycomb.common impl-parent 1.16.9 - ../../common/impl-parent 4.0.0 - org.openecomp.demo.vnf sample-plugin-impl - 1.0.0-SNAPSHOT bundle @@ -34,7 +31,7 @@ org.openecomp.demo.vnf sample-plugin-api - 1.0.0-SNAPSHOT + latest -- cgit 1.2.3-korg