diff options
| author |   Yang Xu <yang.xu3@huawei.com> | 2018-11-09 01:53:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-11-09 01:53:59 +0000 |
| commit | f6798b6488efc4e2fa03e928baaa5f8984545c76 (patch) | |
| tree | 99c1d7b214ff57d27ea4d63205eaa9d767e78136 /deployment/heat/onap-oom/env | |
| parent | 9a0edf15482bbd75a0cb337ee68e7ec7c58aaaeb (diff) | |
| parent | 48a3294079b0fee0ad9d33f7c7262f6c87255947 (diff) | |
Merge "Alleviate startup disk contention issues"
Diffstat (limited to 'deployment/heat/onap-oom/env')
| -rw-r--r-- | deployment/heat/onap-oom/env/tlab/onap-oom.env | 6 | ||||
| -rw-r--r-- | deployment/heat/onap-oom/env/windriver/onap-oom-light.env | 2 | ||||
| -rw-r--r-- | deployment/heat/onap-oom/env/windriver/onap-oom.env | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env index 65d952a3a..bde870976 100644 --- a/deployment/heat/onap-oom/env/tlab/onap-oom.env +++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env @@ -5,8 +5,8 @@ parameters: apt_proxy: 192.168.31.204:8000 docker_proxy: 192.168.31.204:5000 - rancher_vm_flavor: m5.xlarge - k8s_vm_flavor: m4.xlarge + rancher_vm_flavor: m1.xlarge + k8s_vm_flavor: m1.xlarge etcd_vm_flavor: m1.large orch_vm_flavor: m1.xlarge @@ -32,7 +32,7 @@ parameters: openStackPrivateSubnetId: "__oam_subnet_id__" openStackPrivateNetCidr: "__oam_network_cidr__" openStackOamNetworkCidrPrefix: "10.0" - dcaeCollectorIp: "__k8s_1_vm_ip__" + dcaeCollectorIp: "__k8s_01_vm_ip__" vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" demoArtifactsVersion: "1.3.0-SNAPSHOT" scriptVersion: "1.3.0-SNAPSHOT" diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom-light.env b/deployment/heat/onap-oom/env/windriver/onap-oom-light.env index c512c5111..4ded3dff4 100644 --- a/deployment/heat/onap-oom/env/windriver/onap-oom-light.env +++ b/deployment/heat/onap-oom/env/windriver/onap-oom-light.env @@ -28,7 +28,7 @@ parameters: openStackPrivateSubnetId: "__oam_subnet_id__" openStackPrivateNetCidr: "__oam_network_cidr__" openStackOamNetworkCidrPrefix: "10.0" - dcaeCollectorIp: "__k8s_1_vm_ip__" + dcaeCollectorIp: "__k8s_01_vm_ip__" vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" demoArtifactsVersion: "1.2.2" scriptVersion: "1.2.1" diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env index ade8565ba..2d28fd7ea 100644 --- a/deployment/heat/onap-oom/env/windriver/onap-oom.env +++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env @@ -5,7 +5,7 @@ parameters: apt_proxy: 10.12.5.2:8000 docker_proxy: 10.12.5.2:5000 - rancher_vm_flavor: m2.xlarge + rancher_vm_flavor: m1.xlarge k8s_vm_flavor: m1.xlarge etcd_vm_flavor: m1.large orch_vm_flavor: m1.xlarge @@ -33,7 +33,7 @@ parameters: openStackPrivateNetCidr: "__oam_network_cidr__" openStackSecurityGroup: "__sec_group__" openStackOamNetworkCidrPrefix: "10.0" - dcaeCollectorIp: "__k8s_1_vm_ip__" + dcaeCollectorIp: "__k8s_01_vm_ip__" vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" demoArtifactsVersion: "1.3.0-SNAPSHOT" scriptVersion: "1.3.0-SNAPSHOT" |