Code Review / demo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 2: 5a14ee3)
Merge "setup onap demo by vagrant"
authorMarco Platania <platania@research.att.com>
Fri, 12 May 2017 13:43:35 +0000 (13:43 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 12 May 2017 13:43:35 +0000 (13:43 +0000)
boot/policy_vm_init.sh patch | blob | history
boot/vid_vm_init.sh patch | blob | history
heat/OpenECOMP/onap_openstack.env patch | blob | history
heat/OpenECOMP/onap_openstack.yaml patch | blob | history
heat/OpenECOMP/onap_openstack_float.env patch | blob | history
heat/OpenECOMP/onap_openstack_float.yaml patch | blob | history
heat/OpenECOMP/onap_openstack_nofloat.env patch | blob | history
heat/OpenECOMP/onap_openstack_nofloat.yaml patch | blob | history

diff --git a/boot/policy_vm_init.sh b/boot/policy_vm_init.sh
index 067ab1d..ffb26bc 100644 (file)
--- a/boot/policy_vm_init.sh
+++ b/boot/policy_vm_init.sh
@@ -23,16 +23,16 @@ echo $IP_ADDRESS > config/pe/ip_addr.txt
 
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 
-docker pull $NEXUS_DOCKER_REPO/openecomp/policy/policy-db:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-db:$DOCKER_IMAGE_VERSION openecomp/policy/policy-db:latest
+docker pull $NEXUS_DOCKER_REPO/onap/policy/policy-db:$DOCKER_IMAGE_VERSION
+docker tag $NEXUS_DOCKER_REPO/onap/policy/policy-db:$DOCKER_IMAGE_VERSION onap/policy/policy-db:latest
 
-docker pull $NEXUS_DOCKER_REPO/openecomp/policy/policy-pe:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-pe:$DOCKER_IMAGE_VERSION openecomp/policy/policy-pe:latest
+docker pull $NEXUS_DOCKER_REPO/onap/policy/policy-pe:$DOCKER_IMAGE_VERSION
+docker tag $NEXUS_DOCKER_REPO/onap/policy/policy-pe:$DOCKER_IMAGE_VERSION onap/policy/policy-pe:latest
 
-docker pull $NEXUS_DOCKER_REPO/openecomp/policy/policy-drools:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-drools:$DOCKER_IMAGE_VERSION openecomp/policy/policy-drools:latest
+docker pull $NEXUS_DOCKER_REPO/onap/policy/policy-drools:$DOCKER_IMAGE_VERSION
+docker tag $NEXUS_DOCKER_REPO/onap/policy/policy-drools:$DOCKER_IMAGE_VERSION onap/policy/policy-drools:latest
 
-docker pull $NEXUS_DOCKER_REPO/openecomp/policy/policy-nexus:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-nexus:$DOCKER_IMAGE_VERSION openecomp/policy/policy-nexus:latest
+docker pull $NEXUS_DOCKER_REPO/onap/policy/policy-nexus:$DOCKER_IMAGE_VERSION
+docker tag $NEXUS_DOCKER_REPO/onap/policy/policy-nexus:$DOCKER_IMAGE_VERSION onap/policy/policy-nexus:latest
 
 /opt/docker/docker-compose up -d
diff --git a/boot/vid_vm_init.sh b/boot/vid_vm_init.sh
index 3d6e359..fe2bb56 100644 (file)
--- a/boot/vid_vm_init.sh
+++ b/boot/vid_vm_init.sh
@@ -16,6 +16,6 @@ docker pull $NEXUS_DOCKER_REPO/library/mariadb:10
 docker rm -f vid-mariadb
 docker rm -f vid-server
 
-docker run --name vid-mariadb -e MYSQL_DATABASE=vid_openecomp -e MYSQL_USER=vidadmin -e MYSQL_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -e MYSQL_ROOT_PASSWORD=LF+tp_1WqgSY -v /opt/vid/lf_config/vid-my.cnf:/etc/mysql/my.cnf -v /opt/vid/lf_config/vid-pre-init.sql:/docker-entrypoint-initdb.d/vid-pre-init.sql -v /var/lib/mysql -d mariadb:10
+docker run --name vid-mariadb -e MYSQL_DATABASE=vid_openecomp_epsdk -e MYSQL_USER=vidadmin -e MYSQL_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -e MYSQL_ROOT_PASSWORD=LF+tp_1WqgSY -v /opt/vid/lf_config/vid-my.cnf:/etc/mysql/my.cnf -v /opt/vid/lf_config/vid-pre-init.sql:/docker-entrypoint-initdb.d/vid-pre-init.sql -v /var/lib/mysql -d mariadb:10
 
 docker run -e VID_MYSQL_DBNAME=vid_openecomp -e VID_MYSQL_PASS=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d $NEXUS_DOCKER_REPO/openecomp/vid:$DOCKER_IMAGE_VERSION
diff --git a/heat/OpenECOMP/onap_openstack.env b/heat/OpenECOMP/onap_openstack.env
index 60e19d8..c0fa56d 100644 (file)
--- a/heat/OpenECOMP/onap_openstack.env
+++ b/heat/OpenECOMP/onap_openstack.env
@@ -63,7 +63,8 @@ parameters:
   #                    #
   ######################
 
-  external_dns: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf in UNIX-based Operating Systems)
+  dns_list: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf in UNIX-based Operating Systems)
+  external_dns: PUT THE FIRST ADDRESS OF THE EXTERNAL DNS LIST HERE
 
   ### Private IP addresses ###
 
diff --git a/heat/OpenECOMP/onap_openstack.yaml b/heat/OpenECOMP/onap_openstack.yaml
index 335cdba..881472e 100644 (file)
--- a/heat/OpenECOMP/onap_openstack.yaml
+++ b/heat/OpenECOMP/onap_openstack.yaml
@@ -123,9 +123,13 @@ parameters:
   #                    #
   ######################
 
-  external_dns:
+  dns_list:
     type: comma_delimited_list
-    description: External DNS for OAM ONAP network
+    description: List of External DNS for OAM ONAP network
+
+  external_dns:
+    type: string
+    description: First element of the dns_list for ONAP network
 
   ### Private IP addresses ###
   oam_network_cidr:
@@ -209,7 +213,7 @@ parameters:
 
   dcae_base_environment:
     type: string
-    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/...)
+    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/1-NIC-FLOATING-IPS)
 
   dcae_zone:
     type: string
@@ -287,7 +291,7 @@ resources:
             rand: { get_resource: random-str }
       network_id: { get_resource: oam_ecomp }
       cidr: { get_param: oam_network_cidr }
-      dns_nameservers: { get_param: external_dns }
+      dns_nameservers: { get_param: dns_list }
 
   router:
     type: OS::Neutron::Router
diff --git a/heat/OpenECOMP/onap_openstack_float.env b/heat/OpenECOMP/onap_openstack_float.env
index 1dfc7f8..06ba61a 100644 (file)
--- a/heat/OpenECOMP/onap_openstack_float.env
+++ b/heat/OpenECOMP/onap_openstack_float.env
@@ -63,7 +63,8 @@ parameters:
   #                    #
   ######################
 
-  external_dns: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf in UNIX-based Operating Systems)
+  dns_list: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf in UNIX-based Operating Systems)
+  external_dns: PUT THE FIRST ADDRESS OF THE EXTERNAL DNS LIST HERE
 
   ### Floating IP addresses ###
 
diff --git a/heat/OpenECOMP/onap_openstack_float.yaml b/heat/OpenECOMP/onap_openstack_float.yaml
index 897e2a1..0ffe093 100644 (file)
--- a/heat/OpenECOMP/onap_openstack_float.yaml
+++ b/heat/OpenECOMP/onap_openstack_float.yaml
@@ -123,9 +123,13 @@ parameters:
   #                    #
   ######################
 
-  external_dns:
+  dns_list:
     type: comma_delimited_list
-    description: External DNS for OAM ONAP network
+    description: List of External DNS for OAM ONAP network
+
+  external_dns:
+    type: string
+    description: First element of the dns_list for ONAP network
 
   ### Floating IP addresses ###
   aai_float_ip:
@@ -278,7 +282,7 @@ parameters:
 
   dcae_base_environment:
     type: string
-    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/...)
+    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/1-NIC-FLOATING-IPS)
 
   dcae_zone:
     type: string
@@ -356,7 +360,7 @@ resources:
             rand: { get_resource: random-str }
       network_id: { get_resource: oam_ecomp }
       cidr: { get_param: oam_network_cidr }
-      dns_nameservers: { get_param: external_dns }
+      dns_nameservers: { get_param: dns_list }
 
   router:
     type: OS::Neutron::Router
diff --git a/heat/OpenECOMP/onap_openstack_nofloat.env b/heat/OpenECOMP/onap_openstack_nofloat.env
index 49b68e3..07fa713 100644 (file)
--- a/heat/OpenECOMP/onap_openstack_nofloat.env
+++ b/heat/OpenECOMP/onap_openstack_nofloat.env
@@ -63,6 +63,8 @@ parameters:
   #                    #
   ######################
 
+  external_dns: PUT THE ADDRESS OF THE EXTERNAL DNS HERE
+
   oam_network_cidr: 10.0.0.0/8
   aai_ip_addr: 10.0.1.1
   appc_ip_addr: 10.0.2.1
diff --git a/heat/OpenECOMP/onap_openstack_nofloat.yaml b/heat/OpenECOMP/onap_openstack_nofloat.yaml
index 2a54b83..36b57ed 100644 (file)
--- a/heat/OpenECOMP/onap_openstack_nofloat.yaml
+++ b/heat/OpenECOMP/onap_openstack_nofloat.yaml
@@ -124,7 +124,7 @@ parameters:
   ######################
 
   external_dns:
-    type: comma_delimited_list
+    type: string
     description: External DNS for OAM ONAP network
 
   ### Private IP addresses ###
@@ -209,7 +209,7 @@ parameters:
 
   dcae_base_environment:
     type: string
-    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/...)
+    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/1-NIC-FLOATING-IPS)
 
   dcae_zone:
     type: string
Demo applications and templates for ONAP platform instantiation.