Code Review
/
demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "fix vagrant script to deploy onap"
[demo.git]
/
heat
/
ONAP
/
onap_openstack_float.env
diff --git
a/heat/ONAP/onap_openstack_float.env
b/heat/ONAP/onap_openstack_float.env
index
a7a98e7
..
e970b7f
100644
(file)
--- a/
heat/ONAP/onap_openstack_float.env
+++ b/
heat/ONAP/onap_openstack_float.env
@@
-16,6
+16,8
@@
parameters:
ubuntu_1604_image: PUT THE UBUNTU 16.04 IMAGE NAME HERE
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
flavor_small: PUT THE SMALL FLAVOR NAME HERE
flavor_medium: PUT THE MEDIUM FLAVOR NAME HERE
@@
-26,12
+28,18
@@
parameters:
flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE
flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE
+ security_group: PUT THE NAME OF THE SECURITY GROUP HERE
+
vm_base_name: vm1
key_name: onap_key
vm_base_name: vm1
key_name: onap_key
+ dcae_key_name: dcae_key
+
pub_key: PUT YOUR PUBLIC KEY HERE
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
nexus_repo: https://nexus.onap.org/content/sites/raw
nexus_docker_repo: nexus3.onap.org:10001
@@
-56,7
+64,7
@@
parameters:
horizon_url: PUT THE HORIZON URL HERE
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
cloud_env: openstack
@@
-162,7
+170,7
@@
parameters:
appc_docker: 1.1-STAGING-latest
so_docker: 1.1-STAGING-latest
mr_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-
STAGING-
latest
+ dcae_docker: 1.1-latest
policy_docker: 1.1-STAGING-latest
portal_docker: 1.3-STAGING-latest
robot_docker: 1.1-STAGING-latest
policy_docker: 1.1-STAGING-latest
portal_docker: 1.3-STAGING-latest
robot_docker: 1.1-STAGING-latest
@@
-174,7
+182,9
@@
parameters:
mvim_docker: latest
vfc_docker: latest
uui_docker: latest
mvim_docker: latest
vfc_docker: latest
uui_docker: latest
+ esr_docker: latest
dgbuilder_docker: 0.1-STAGING-latest
dgbuilder_docker: 0.1-STAGING-latest
+ cli_docker: 1.1-STAGING-latest
#####################
# #
#####################
# #