summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitreview2
-rw-r--r--heat/OpenECOMP/openecomp_rackspace.env14
-rw-r--r--heat/vFW/base_vfw.env6
-rw-r--r--heat/vLB/base_vlb.env6
-rw-r--r--heat/vLB/dnsscaling.env6
-rw-r--r--heat/vLB/packet_gen_vlb.env6
-rwxr-xr-xpom.xml6
-rwxr-xr-xscripts/deploy.sh2
8 files changed, 26 insertions, 22 deletions
diff --git a/.gitreview b/.gitreview
index ab3f0546..c17f50d7 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
[gerrit]
-host=gerrit.openecomp.org
+host=gerrit.onap.org
port=29418
project=demo.git
diff --git a/heat/OpenECOMP/openecomp_rackspace.env b/heat/OpenECOMP/openecomp_rackspace.env
index 3e8e09c2..178dfa7d 100644
--- a/heat/OpenECOMP/openecomp_rackspace.env
+++ b/heat/OpenECOMP/openecomp_rackspace.env
@@ -1,6 +1,6 @@
parameters:
- # Generic parameters used across all OpenECOMP components
+ # Generic parameters used across all ONAP components
public_net_id: 00000000-0000-0000-0000-000000000000
@@ -8,9 +8,9 @@ parameters:
pub_key: INSERT YOUR PUBLIC KEY HERE
- nexus_repo: https://nexus.openecomp.org/content/sites/raw
+ nexus_repo: https://nexus.onap.org/content/sites/raw
- nexus_docker_repo: nexus3.openecomp.org:10001
+ nexus_docker_repo: nexus3.onap.org:10001
nexus_username: INSERT YOUR USERNAME HERE
@@ -24,6 +24,10 @@ parameters:
artifacts_version: 1.0.0
+ docker_version: 1.0-STAGING-latest
+
+ gerrit_branch: release-1.0.0
+
# Parameters for DCAE instantiation
@@ -39,9 +43,9 @@ parameters:
openstack_password: INSERT YOUR PASSWORD HERE
- nexus_repo_root: https://nexus.openecomp.org
+ nexus_repo_root: https://nexus.onap.org
- nexus_url_snapshot: https://nexus.openecomp.org/content/repositories/snapshots
+ nexus_url_snapshot: https://nexus.onap.org/content/repositories/snapshots
openstack_region: IAD
diff --git a/heat/vFW/base_vfw.env b/heat/vFW/base_vfw.env
index 8223a6af..23aa18c8 100644
--- a/heat/vFW/base_vfw.env
+++ b/heat/vFW/base_vfw.env
@@ -23,8 +23,8 @@ parameters:
vf_module_id: vFirewall
dcae_collector_ip: 10.0.4.102
dcae_collector_port: 8080
- repo_url_blob: https://nexus.openecomp.org/content/repositories/raw
- repo_url_artifacts: https://nexus.openecomp.org/content/repositories/snapshots
- demo_artifacts_version: 1.0.0-SNAPSHOT
+ repo_url_blob: https://nexus.onap.org/content/sites/raw
+ repo_url_artifacts: https://nexus.onap.org/content/repositories/snapshots
+ demo_artifacts_version: 1.1.0-SNAPSHOT
key_name: vfw_key
pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
diff --git a/heat/vLB/base_vlb.env b/heat/vLB/base_vlb.env
index 2598a384..087158ae 100644
--- a/heat/vLB/base_vlb.env
+++ b/heat/vLB/base_vlb.env
@@ -17,8 +17,8 @@ parameters:
vf_module_id: vLoadBalancer
dcae_collector_ip: 10.0.4.102
dcae_collector_port: 8080
- repo_url_blob: https://nexus.openecomp.org/content/repositories/raw
- repo_url_artifacts: https://nexus.openecomp.org/content/repositories/snapshots
- demo_artifacts_version: 1.0.0-SNAPSHOT
+ repo_url_blob: https://nexus.onap.org/content/sites/raw
+ repo_url_artifacts: https://nexus.onap.org/content/repositories/snapshots
+ demo_artifacts_version: 1.1.0-SNAPSHOT
key_name: vlb_key
pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
diff --git a/heat/vLB/dnsscaling.env b/heat/vLB/dnsscaling.env
index 5496a6cf..6def6646 100644
--- a/heat/vLB/dnsscaling.env
+++ b/heat/vLB/dnsscaling.env
@@ -12,8 +12,8 @@ parameters:
vdns_name_0: zdfw1lb01dns02
vnf_id: vLoadBalancer_demo_app
vf_module_id: vLoadBalancer
- repo_url_blob: https://nexus.openecomp.org/content/repositories/raw
- repo_url_artifacts: https://nexus.openecomp.org/content/repositories/snapshots
- demo_artifacts_version: 1.0.0-SNAPSHOT
+ repo_url_blob: https://nexus.onap.org/content/sites/raw
+ repo_url_artifacts: https://nexus.onap.org/content/repositories/snapshots
+ demo_artifacts_version: 1.1.0-SNAPSHOT
key_name: vlb_key_scaling
pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
diff --git a/heat/vLB/packet_gen_vlb.env b/heat/vLB/packet_gen_vlb.env
index 5143861a..3bb5cb31 100644
--- a/heat/vLB/packet_gen_vlb.env
+++ b/heat/vLB/packet_gen_vlb.env
@@ -4,8 +4,8 @@ parameters:
public_net_id: 00000000-0000-0000-0000-000000000000
vlb_ipaddr: INSERT THE PUBLIC ADDRESS OF THE vLB HERE
vpg_name_0: ziad1vdnspg01pg01
- repo_url_blob: https://nexus.openecomp.org/content/repositories/raw
- repo_url_artifacts: https://nexus.openecomp.org/content/repositories/snapshots
- demo_artifacts_version: 1.0.0-SNAPSHOT
+ repo_url_blob: https://nexus.onap.org/content/sites/raw
+ repo_url_artifacts: https://nexus.onap.org/content/repositories/snapshots
+ demo_artifacts_version: 1.1.0-SNAPSHOT
key_name: pgforvdnsdemo_key
pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
diff --git a/pom.xml b/pom.xml
index 737a4b7c..cb605d5a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
- <nexusUrl>https://nexus.openecomp.org/</nexusUrl>
+ <nexusUrl>https://nexus.onap.org/</nexusUrl>
<stagingProfileId>176c31dfe190a</stagingProfileId>
<serverId>ecomp-staging</serverId>
</configuration>
@@ -102,12 +102,12 @@
<repository>
<id>ecomp-releases</id>
<name>Demo Release Repository</name>
- <url> https://nexus.openecomp.org/content/repositories/releases/</url>
+ <url> https://nexus.onap.org/content/repositories/releases/</url>
</repository>
<snapshotRepository>
<id>ecomp-snapshots</id>
<name>Demo Snapshot Repository</name>
- <url> https://nexus.openecomp.org/content/repositories/snapshots/</url>
+ <url> https://nexus.onap.org/content/repositories/snapshots/</url>
</snapshotRepository>
</distributionManagement>
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 2ba5ea61..3a4529b4 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -32,7 +32,7 @@ HEAT_VLB_GROUP_ID=$PARENT_GROUP_ID"/heat/vLB"
VFW_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vfw"
VLB_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vlb"
-REPO_URL="https://nexus.openecomp.org/content/sites/raw"
+REPO_URL="https://nexus.onap.org/content/sites/raw"
USER=$(xpath -q -e "//servers/server[id='ecomp-raw']/username/text()" "$SETTINGS_FILE")
PASS=$(xpath -q -e "//servers/server[id='ecomp-raw']/password/text()" "$SETTINGS_FILE")
NETRC=$(mktemp)