aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/heat/onap-oom/env/huawei
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-07-24 11:56:01 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-07-24 11:56:01 -0700
commit978171e337e4297bfb777474aa41218c0521ef4e (patch)
tree1164f48e43bd61668ad695bba46f6c6b64881b19 /deployment/heat/onap-oom/env/huawei
parente2911966a4f653ffc75ce0888f5e10d63a6b8499 (diff)
Refactor OOM deployment scripts
Change-Id: I50e5cc63bc31b2cb236e73d28c4a63bcad62986c Issue-ID: INT-532 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'deployment/heat/onap-oom/env/huawei')
-rw-r--r--deployment/heat/onap-oom/env/huawei/onap-heat.env42
-rw-r--r--deployment/heat/onap-oom/env/huawei/onap-oom.env10
2 files changed, 7 insertions, 45 deletions
diff --git a/deployment/heat/onap-oom/env/huawei/onap-heat.env b/deployment/heat/onap-oom/env/huawei/onap-heat.env
deleted file mode 100644
index 0b97f7dba..000000000
--- a/deployment/heat/onap-oom/env/huawei/onap-heat.env
+++ /dev/null
@@ -1,42 +0,0 @@
-parameters:
-
- ubuntu_1604_image: xenial
-
- apt_proxy: 10.145.122.117:8000
- docker_proxy: 10.145.123.23:5000
-
- rancher_vm_flavor: m1.xlarge
- k8s_vm_flavor: m1.xlarge
-
- public_net_id: 7baa99ac-43a0-4013-9dfb-bbb94fdcd91a
- key_name: onap-key
-
- oam_network_cidr: 10.0.0.0/16
-
- integration_override_yaml: >
- global:
- repository: 10.145.123.23:5000
- pullPolicy: IfNotPresent
- robot:
- openStackKeyStoneUrl: "http://10.145.122.118:5000"
- openStackPublicNetId: "3a6247f1-fac6-4167-a49f-33cc8415ccf4"
- openStackPassword: "${OS_PASSWORD}"
- openStackTenantId: "${OS_PROJECT_ID}"
- openStackUserName: "${OS_USERNAME}"
- ubuntu14Image: "trusty"
- ubuntu16Image: "xenial"
- openStackPrivateNetId: "__oam_network_id__"
- openStackPrivateSubnetId: "__oam_subnet_id__"
- openStackPrivateNetCidr: "10.0.0.0/16"
- openStackOamNetworkCidrPrefix: "10.0"
- dcaeCollectorIp: "__k8s_1_vm_ip__"
- vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
- so:
- config:
- openStackUserName: "${OS_USERNAME}"
- openStackKeyStoneUrl: "http://10.145.122.118:5000"
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- appc:
- replicaCount: 3
- sdnc:
- replicaCount: 3
diff --git a/deployment/heat/onap-oom/env/huawei/onap-oom.env b/deployment/heat/onap-oom/env/huawei/onap-oom.env
index 0b97f7dba..f346fa59f 100644
--- a/deployment/heat/onap-oom/env/huawei/onap-oom.env
+++ b/deployment/heat/onap-oom/env/huawei/onap-oom.env
@@ -15,11 +15,11 @@ parameters:
integration_override_yaml: >
global:
- repository: 10.145.123.23:5000
+ repository: __docker_proxy__
pullPolicy: IfNotPresent
robot:
openStackKeyStoneUrl: "http://10.145.122.118:5000"
- openStackPublicNetId: "3a6247f1-fac6-4167-a49f-33cc8415ccf4"
+ openStackPublicNetId: "__public_net_id__"
openStackPassword: "${OS_PASSWORD}"
openStackTenantId: "${OS_PROJECT_ID}"
openStackUserName: "${OS_USERNAME}"
@@ -27,7 +27,7 @@ parameters:
ubuntu16Image: "xenial"
openStackPrivateNetId: "__oam_network_id__"
openStackPrivateSubnetId: "__oam_subnet_id__"
- openStackPrivateNetCidr: "10.0.0.0/16"
+ openStackPrivateNetCidr: "__oam_network_cidr__"
openStackOamNetworkCidrPrefix: "10.0"
dcaeCollectorIp: "__k8s_1_vm_ip__"
vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
@@ -38,5 +38,9 @@ parameters:
openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
appc:
replicaCount: 3
+ config:
+ enableClustering: true
sdnc:
replicaCount: 3
+ config:
+ enableClustering: true