X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack_nofloat.env;h=49abd6642d76faadfdc53f430d9928f9d4a97146;hb=c0e48e2923af5ea1e77d8741d695ce5553d22ab3;hp=dad932be8d6da636a2f31b7e3e2e9e1bc0b35cd4;hpb=97565f21515574944cd08e43437eff1c69754cab;p=demo.git

diff --git a/heat/ONAP/onap_openstack_nofloat.env b/heat/ONAP/onap_openstack_nofloat.env
index dad932be..49abd664 100644
--- a/heat/ONAP/onap_openstack_nofloat.env
+++ b/heat/ONAP/onap_openstack_nofloat.env
@@ -12,6 +12,8 @@ parameters:
 
   ubuntu_1604_image: PUT THE UBUNTU 16.04 IMAGE NAME HERE
 
+  centos_7_image: PUT THE CENTOS 7 IMAGE NAME HERE
+
   flavor_small: PUT THE SMALL FLAVOR NAME HERE
 
   flavor_medium: PUT THE MEDIUM FLAVOR NAME HERE
@@ -20,12 +22,20 @@ parameters:
 
   flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
 
+  flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
+
+  security_group: PUT THE NAME OF THE SECURITY GROUP HERE
+
   vm_base_name: vm1
 
   key_name: onap_key
 
+  dcae_key_name: dcae_key
+
   pub_key: PUT YOUR PUBLIC KEY HERE
 
+  dcae_pub_key: PUT YOUR DCAE PUBLIC KEY HERE
+
   nexus_repo: https://nexus.onap.org/content/sites/raw
 
   nexus_docker_repo: nexus3.onap.org:10001
@@ -38,10 +48,6 @@ parameters:
 
   artifacts_version: 1.1.0-SNAPSHOT
 
-  docker_version: 1.1-STAGING-latest
-
-  gerrit_branch: master
-
   openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
 
   openstack_username: PUT YOUR OPENSTACK USERNAME HERE
@@ -54,7 +60,7 @@ parameters:
 
   horizon_url: PUT THE HORIZON URL HERE
 
-  keystone_url: PUT THE KEYSTONE URL HERE
+  keystone_url: PUT THE KEYSTONE URL HERE (do not include version number)
 
   cloud_env: openstack_nofloat
 
@@ -66,8 +72,10 @@ parameters:
   ######################
 
   external_dns: PUT THE ADDRESS OF THE EXTERNAL DNS HERE
-
   oam_network_cidr: 10.0.0.0/16
+
+  ### Private IP addresses ###
+
   aai1_ip_addr: 10.0.1.1
   aai2_ip_addr: 10.0.1.2
   appc_ip_addr: 10.0.2.1
@@ -78,7 +86,7 @@ parameters:
   dcae_hdp2_ip_addr: 10.0.4.104
   dcae_hdp3_ip_addr: 10.0.4.105
   dns_ip_addr: 10.0.100.1
-  mso_ip_addr: 10.0.5.1
+  so_ip_addr: 10.0.5.1
   mr_ip_addr: 10.0.11.1
   policy_ip_addr: 10.0.6.1
   portal_ip_addr: 10.0.9.1
@@ -86,7 +94,8 @@ parameters:
   sdc_ip_addr: 10.0.3.1
   sdnc_ip_addr: 10.0.7.1
   vid_ip_addr: 10.0.8.1
-
+  clamp_ip_addr: 10.0.12.1
+  openo_ip_addr: 10.0.14.1
 
   ###########################
   #                         #
@@ -108,3 +117,62 @@ parameters:
 
   dcae_code_version: 1.1.0
 
+
+  ################################
+  #                              #
+  # Docker versions and branches #
+  #                              #
+  ################################
+
+  aai_branch: master
+  appc_branch: master
+  so_branch: master
+  mr_branch: master
+  dcae_branch: master
+  policy_branch: master
+  portal_branch: release-1.3.0
+  robot_branch: master
+  sdc_branch: master
+  sdnc_branch: master
+  vid_branch: master
+  clamp_branch: master
+  vnfsdk_branch: master
+
+  aai_docker: 1.1-STAGING-latest
+  appc_docker: 1.1-STAGING-latest
+  so_docker: 1.1-STAGING-latest
+  mr_docker: 1.1-STAGING-latest
+  dcae_docker: 1.1-latest
+  policy_docker: 1.1-STAGING-latest
+  portal_docker: v1.3.0
+  robot_docker: 1.1-STAGING-latest
+  sdc_docker: 1.1-STAGING-latest
+  sdnc_docker: 1.2-STAGING-latest
+  vid_docker: 1.1-STAGING-latest
+  clamp_docker: 1.1-STAGING-latest
+  msb_docker: latest
+  mvim_docker: latest
+  vfc_docker: latest
+  uui_docker: latest
+  esr_docker: latest
+  dgbuilder_docker: 0.1-STAGING-latest
+  cli_docker: v1.1.0
+
+  #####################
+  #                   #
+  # ONAP repositories #
+  #                   #
+  #####################
+  aai_repo: http://gerrit.onap.org/r/aai/test-config
+  appc_repo: http://gerrit.onap.org/r/appc/deployment.git
+  dcae_repo: http://gerrit.onap.org/r/dcae/demo/startup/controller.git
+  mr_repo: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git 
+  so_repo: http://gerrit.onap.org/r/so/docker-config.git
+  policy_repo: http://gerrit.onap.org/r/policy/docker.git
+  portal_repo: http://gerrit.onap.org/r/portal.git
+  robot_repo: http://gerrit.onap.org/r/testsuite/properties.git
+  sdc_repo: http://gerrit.onap.org/r/sdc.git
+  sdnc_repo: http://gerrit.onap.org/r/sdnc/oam.git
+  vid_repo: http://gerrit.onap.org/r/vid.git
+  clamp_repo: http://gerrit.onap.org/r/clamp.git
+  vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git