Code Review
/
integration.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Workaround for AAI crashloop issues
[integration.git]
/
deployment
/
heat
/
onap-oom
/
env
/
windriver
/
onap-oom.env
diff --git
a/deployment/heat/onap-oom/env/windriver/onap-oom.env
b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index
dccfed8
..
6d471ff
100644
(file)
--- a/
deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/
deployment/heat/onap-oom/env/windriver/onap-oom.env
@@
-5,15
+5,19
@@
parameters:
apt_proxy: 10.12.5.2:8000
docker_proxy: 10.12.5.2:5000
apt_proxy: 10.12.5.2:8000
docker_proxy: 10.12.5.2:5000
- rancher_vm_flavor: m
2.x
large
+ rancher_vm_flavor: m
1.
large
k8s_vm_flavor: m1.xlarge
k8s_vm_flavor: m1.xlarge
- etcd_vm_flavor: m1.
large
- orch_vm_flavor: m1.
xlarge
+ etcd_vm_flavor: m1.
medium
+ orch_vm_flavor: m1.
medium
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
oam_network_cidr: 10.0.0.0/16
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
oam_network_cidr: 10.0.0.0/16
+ integration_gerrit_branch: master
+
+ helm_deploy_delay: 2.5m
+
integration_override_yaml: >
global:
repository: __docker_proxy__
integration_override_yaml: >
global:
repository: __docker_proxy__
@@
-33,10
+37,11
@@
parameters:
openStackPrivateNetCidr: "__oam_network_cidr__"
openStackSecurityGroup: "__sec_group__"
openStackOamNetworkCidrPrefix: "10.0"
openStackPrivateNetCidr: "__oam_network_cidr__"
openStackSecurityGroup: "__sec_group__"
openStackOamNetworkCidrPrefix: "10.0"
- dcaeCollectorIp: "__k8s_1_vm_ip__"
+ dcaeCollectorIp: "__k8s_
0
1_vm_ip__"
vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
- demoArtifactsVersion: "1.3.0-SNAPSHOT"
- scriptVersion: "1.3.0-SNAPSHOT"
+ demoArtifactsVersion: "1.3.0"
+ demoArtifactsRepoUrl: "https://nexus.onap.org/content/repositories/releases"
+ scriptVersion: "1.3.0"
rancherIpAddress: "__rancher_ip_addr__"
config:
openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
rancherIpAddress: "__rancher_ip_addr__"
config:
openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
@@
-47,10
+52,9
@@
parameters:
openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0"
openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
appc:
openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0"
openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
appc:
- replicaCount:
1
+ replicaCount:
3
config:
config:
- enableClustering: false
- enableAAF: true
+ enableClustering: true
openStackType: "OpenStackProvider"
openStackName: "OpenStack"
openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0"
openStackType: "OpenStackProvider"
openStackName: "OpenStack"
openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0"
@@
-59,6
+63,18
@@
parameters:
openStackUserName: "${OS_USERNAME}"
openStackEncryptedPassword: "${OS_PASSWORD}"
sdnc:
openStackUserName: "${OS_USERNAME}"
openStackEncryptedPassword: "${OS_PASSWORD}"
sdnc:
- replicaCount:
1
+ replicaCount:
3
config:
config:
- enableClustering: false
+ enableClustering: true
+ aai:
+ liveness:
+ initialDelaySeconds: 120
+ aai-data-router:
+ liveness:
+ initialDelaySeconds: 120
+ aai-sparky-be:
+ liveness:
+ initialDelaySeconds: 120
+ aai-spike:
+ liveness:
+ initialDelaySeconds: 120