From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 25 May 2018 04:16:57 +0000 (+0000)
Subject: Merge "Set the CLI docker version to beijing"
X-Git-Tag: v1.2.1~35
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=020b98571653d0e9cb40fed7e46ebd883de368f0;hp=-c;p=demo.git

Merge "Set the CLI docker version to beijing"
---

020b98571653d0e9cb40fed7e46ebd883de368f0
diff --combined heat/ONAP/onap_openstack.env
index 3382d2a4,a563fc34..437a73c2
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@@ -22,12 -22,16 +22,12 @@@ parameters
  
    flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
  
 -  flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE
 -
    vm_base_name: onap
  
    key_name: onap_key
  
    pub_key: PUT YOUR PUBLIC KEY HERE
  
 -  nexus_repo: https://nexus.onap.org/content/sites/raw
 -
    nexus_docker_repo: nexus3.onap.org:10001
  
    nexus_username: docker
@@@ -36,7 -40,7 +36,7 @@@
  
    dmaap_topic: AUTO
  
 -  artifacts_version: 1.2.0-SNAPSHOT
 +  artifacts_version: 1.2.1-SNAPSHOT
  
    openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
  
@@@ -50,6 -54,8 +50,6 @@@
  
    openstack_region: RegionOne
  
 -  horizon_url: PUT THE HORIZON URL HERE
 -
    keystone_url: PUT THE KEYSTONE URL HERE (do not include version number)
  
    cloud_env: openstack
@@@ -95,7 -101,18 +95,7 @@@
    #                         #
    ###########################
  
 -  dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R1, R2MVP, R2, or R2PLUS)
 -  dnsaas_config_enabled: PUT WHETHER TO USE PROXYED DESIGNATE
 -  dnsaas_region: PUT THE DESIGNATE PROVIDING OPENSTACK'S REGION HERE
 -  dnsaas_keystone_url: PUT THE DESIGNATE PROVIDING OPENSTACK'S KEYSTONE URL HERE
 -  dnsaas_tenant_name: PUT THE TENANT NAME IN THE DESIGNATE PROVIDING OPENSTACK HERE (FOR R1 USE THE SAME AS openstack_tenant_name)
 -  dnsaas_username: PUT THE DESIGNATE PROVIDING OPENSTACK'S USERNAME HERE
 -  dnsaas_password: PUT THE DESIGNATE PROVIDING OPENSTACK'S PASSWORD HERE
 -  dcae_keystone_url: PUT THE MULTIVIM PROVIDED KEYSTONE API URL HERE
 -  dcae_centos_7_image: PUT THE CENTOS7 VM IMAGE NAME HERE FOR DCAE LAUNCHED CENTOS7 VM
 -  dcae_domain: PUT THE NAME OF DOMAIN THAT DCAE VMS REGISTER UNDER
 -  dcae_public_key: PUT THE PUBLIC KEY OF A KEYPAIR HERE TO BE USED BETWEEN DCAE LAUNCHED VMS
 -  dcae_private_key: PUT THE SECRET KEY OF A KEYPAIR HERE TO BE USED BETWEEN DCAE LAUNCHED VMS
 +  dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R2MVP, R2, or R2PLUS)
  
    ################################
    #                              #
@@@ -126,9 -143,9 +126,9 @@@
    aai_sparky_docker: 1.2-STAGING-latest
    appc_docker: 1.3.0-SNAPSHOT-latest
    so_docker: 1.2.1
 -  policy_docker: 1.2.0
 +  policy_docker: 1.2.2
    portal_docker: v2.2.0
 -  robot_docker: 1.2-STAGING-latest
 +  robot_docker: 1.2.0
    sdc_docker: 1.2-STAGING-latest
    sdnc_docker: 1.3-STAGING-latest
    vid_docker: 1.2.1
@@@ -137,10 -154,10 +137,10 @@@
    mvim_docker: 1.1.2-STAGING
    mvim_openstack_docker: 1.1.2-SNAPSHOT
    uui_docker: latest
 -  esr_docker: 1.1.0-SNAPSHOT
 +  esr_docker: latest
    sdc_wfd_docker: 1.1.0-SNAPSHOT-STAGING-latest
    dgbuilder_docker: 0.2-STAGING-latest
-   cli_docker: 2.0-STAGING-latest
+   cli_docker: 2.0.2
    music_docker: latest
    oof_docker: latest
    aaf_docker: 2.1.0-SNAPSHOT