Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Do not cache host resolution in DCAEGEN2 nginx
[oom.git]
/
kubernetes
/
config
/
docker
/
init
/
src
/
config
/
dcaegen2
/
heat
/
onap_dcae.env
diff --git
a/kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.env
b/kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.env
index
363de40
..
6b7caad
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.env
+++ b/
kubernetes/config/docker/init/src/config/dcaegen2/heat/onap_dcae.env
@@
-6,19
+6,19
@@
parameters:
# #
##############################################
# #
##############################################
- public_net_id:
OPENSTACK
_PUBLIC_NET_ID_HERE
+ public_net_id:
DCAE_OS
_PUBLIC_NET_ID_HERE
- public_net_name:
OPENSTACK
_PUBLIC_NET_NAME_HERE
+ public_net_name:
DCAE_OS
_PUBLIC_NET_NAME_HERE
ubuntu_1404_image: UBUNTU_14_IMAGE_NAME_HERE
ubuntu_1604_image: UBUNTU_16_IMAGE_NAME_HERE
ubuntu_1404_image: UBUNTU_14_IMAGE_NAME_HERE
ubuntu_1604_image: UBUNTU_16_IMAGE_NAME_HERE
- flavor_small: OPENSTACK_FLAVO
U
R_SMALL_HERE
+ flavor_small: OPENSTACK_FLAVOR_SMALL_HERE
- flavor_medium: OPENSTACK_FLAVO
U
R_MEDIUM_HERE
+ flavor_medium: OPENSTACK_FLAVOR_MEDIUM_HERE
- flavor_large: OPENSTACK_FLAVO
U
R_LARGE_HERE
+ flavor_large: OPENSTACK_FLAVOR_LARGE_HERE
vm_base_name: DCAE_VM_BASE_NAME_HERE
vm_base_name: DCAE_VM_BASE_NAME_HERE
@@
-36,17
+36,17
@@
parameters:
artifacts_version: DEMO_ARTIFACTS_VERSION_HERE
artifacts_version: DEMO_ARTIFACTS_VERSION_HERE
- openstack_tenant_id:
OPENSTACK
_TENANT_ID_HERE
+ openstack_tenant_id:
DCAE_OS
_TENANT_ID_HERE
- openstack_tenant_name:
OPENSTACK
_TENANT_NAME_HERE
+ openstack_tenant_name:
DCAE_OS
_TENANT_NAME_HERE
- openstack_username:
OPENSTACK
_USERNAME_HERE
+ openstack_username:
DCAE_OS
_USERNAME_HERE
- openstack_api_key:
OPENSTACK
_PASSWORD_HERE
+ openstack_api_key:
DCAE_OS
_PASSWORD_HERE
- openstack_region:
OPENSTACK
_REGION_HERE
+ openstack_region:
DCAE_OS
_REGION_HERE
- keystone_url:
OPENSTACK_KEYSTONE_IP
_HERE
+ keystone_url:
DCAE_OS_KEYSTONE_URL
_HERE
cloud_env: openstack
cloud_env: openstack
@@
-59,7
+59,7
@@
parameters:
dns_list: DNS_LIST_HERE
external_dns: EXTERNAL_DNS_HERE
dns_forwarder: DNS_FORWARDER_HERE
dns_list: DNS_LIST_HERE
external_dns: EXTERNAL_DNS_HERE
dns_forwarder: DNS_FORWARDER_HERE
- oam_network_cidr:
NETWORK_CIDR_WITH_ONAP_ROUTE
_HERE
+ oam_network_cidr:
DCAE_OS_OAM_NETWORK_CIDR
_HERE
### Private IP addresses ###
### Private IP addresses ###
@@
-85,7
+85,7
@@
parameters:
dnsaas_tenant_name: DNSAAS_TENANT_NAME_HERE
dnsaas_username: DNSAAS_USERNAME_HERE
dnsaas_password: DNSAAS_PASSWORD_HERE
dnsaas_tenant_name: DNSAAS_TENANT_NAME_HERE
dnsaas_username: DNSAAS_USERNAME_HERE
dnsaas_password: DNSAAS_PASSWORD_HERE
- dcae_keystone_url: DCAE_KEYSTONE_URL_HERE
+ dcae_keystone_url: DCAE_
FINAL_
KEYSTONE_URL_HERE
dcae_centos_7_image: OPENSTACK_CENTOS_7_IMAGE_HERE
dcae_domain: DCAE_DOMAIN_HERE
dcae_public_key: OPENSTACK_PUB_KEY_HERE
dcae_centos_7_image: OPENSTACK_CENTOS_7_IMAGE_HERE
dcae_domain: DCAE_DOMAIN_HERE
dcae_public_key: OPENSTACK_PUB_KEY_HERE