Code Review
/
demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Clean Heat template
[demo.git]
/
heat
/
ONAP
/
onap_openstack.env
diff --git
a/heat/ONAP/onap_openstack.env
b/heat/ONAP/onap_openstack.env
index
0d42937
..
68be91e
100644
(file)
--- a/
heat/ONAP/onap_openstack.env
+++ b/
heat/ONAP/onap_openstack.env
@@
-22,16
+22,12
@@
parameters:
flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
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
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
nexus_docker_repo: nexus3.onap.org:10001
nexus_username: docker
@@
-40,7
+36,7
@@
parameters:
dmaap_topic: AUTO
dmaap_topic: AUTO
- artifacts_version: 1.2.
0
+ artifacts_version: 1.2.
1-SNAPSHOT
openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
@@
-54,8
+50,6
@@
parameters:
openstack_region: RegionOne
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
keystone_url: PUT THE KEYSTONE URL HERE (do not include version number)
cloud_env: openstack
@@
-143,7
+137,7
@@
parameters:
aai_sparky_docker: 1.2-STAGING-latest
appc_docker: 1.3.0-SNAPSHOT-latest
so_docker: 1.2.1
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.0
sdc_docker: 1.2-STAGING-latest
portal_docker: v2.2.0
robot_docker: 1.2.0
sdc_docker: 1.2-STAGING-latest
@@
-154,7
+148,7
@@
parameters:
mvim_docker: 1.1.2-STAGING
mvim_openstack_docker: 1.1.2-SNAPSHOT
uui_docker: latest
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
sdc_wfd_docker: 1.1.0-SNAPSHOT-STAGING-latest
dgbuilder_docker: 0.2-STAGING-latest
cli_docker: 2.0-STAGING-latest