aboutsummaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
Diffstat (limited to 'deployment')
-rw-r--r--deployment/heat/onap-oom/env/gwu/onap-heat.env42
-rw-r--r--deployment/heat/onap-oom/env/gwu/onap-oom.env10
-rw-r--r--deployment/heat/onap-oom/env/huawei/onap-heat.env42
-rw-r--r--deployment/heat/onap-oom/env/huawei/onap-oom.env10
-rw-r--r--deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env45
-rw-r--r--deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env45
-rw-r--r--deployment/heat/onap-oom/env/tlab/onap-oom.yaml (renamed from deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env)6
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-HEAT-Daily.env45
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-HEAT-Verify.env45
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-OOM-Daily.env45
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily.env45
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-OOM-Verify.env45
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-00.env45
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-01.env45
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-02.env45
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-03.env45
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-04.env45
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-05.env45
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-06.env45
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-07.env45
-rw-r--r--deployment/heat/onap-oom/env/windriver/onap-oom.env (renamed from deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily.env)6
-rw-r--r--deployment/heat/onap-oom/onap-oom.yaml2
-rw-r--r--deployment/heat/onap-oom/rancher_vm_entrypoint.sh10
-rwxr-xr-xdeployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh2
24 files changed, 34 insertions, 771 deletions
diff --git a/deployment/heat/onap-oom/env/gwu/onap-heat.env b/deployment/heat/onap-oom/env/gwu/onap-heat.env
deleted file mode 100644
index 7816504e8..000000000
--- a/deployment/heat/onap-oom/env/gwu/onap-heat.env
+++ /dev/null
@@ -1,42 +0,0 @@
-parameters:
-
- ubuntu_1604_image: xenial
-
- apt_proxy: 192.168.1.51:3142
- docker_proxy: 192.168.2.18:5000
-
- rancher_vm_flavor: m1.xlarge
- k8s_vm_flavor: m1.xlarge
-
- public_net_id: c3352d4c-8452-4172-b09c-15f017673708
- key_name: onap-key
-
- oam_network_cidr: 10.0.0.0/16
-
- integration_override_yaml: >
- global:
- repository: 192.168.2.18:5000
- pullPolicy: IfNotPresent
- robot:
- openStackKeyStoneUrl: "http://192.168.1.11:5000"
- openStackPublicNetId: "c3352d4c-8452-4172-b09c-15f017673708"
- 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://192.168.1.11:5000"
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- appc:
- replicaCount: 3
- sdnc:
- replicaCount: 3
diff --git a/deployment/heat/onap-oom/env/gwu/onap-oom.env b/deployment/heat/onap-oom/env/gwu/onap-oom.env
index f2b659adc..b3f1afe56 100644
--- a/deployment/heat/onap-oom/env/gwu/onap-oom.env
+++ b/deployment/heat/onap-oom/env/gwu/onap-oom.env
@@ -15,11 +15,11 @@ parameters:
integration_override_yaml: >
global:
- repository: 192.168.2.18:5000
+ repository: __docker_proxy__
pullPolicy: IfNotPresent
robot:
openStackKeyStoneUrl: "http://192.168.1.11:5000"
- openStackPublicNetId: "c3352d4c-8452-4172-b09c-15f017673708"
+ 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
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
diff --git a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
deleted file mode 100644
index afc72bee9..000000000
--- a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
+++ /dev/null
@@ -1,45 +0,0 @@
-parameters:
-
- ubuntu_1604_image: "Ubuntu 16.04 LTS Generic"
-
- apt_proxy: 192.168.31.204:3142
- docker_proxy: 192.168.31.204:5000
-
- rancher_vm_flavor: m4.xlarge
- k8s_vm_flavor: m4.xlarge
-
- public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
-
- oam_network_cidr: 10.0.0.0/16
-
- integration_override_yaml: >
- global:
- repository: 192.168.31.204:5000
- pullPolicy: IfNotPresent
- robot:
- openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
- openStackPublicNetId: "__oam_network_id__"
- openStackPassword: "${OS_PASSWORD}"
- openStackTenantId: "${OS_PROJECT_ID}"
- openStackUserName: "${OS_USERNAME}"
- ubuntu14Image: "Ubuntu 14.04 LTS Generic"
- ubuntu16Image: "Ubuntu 16.04 LTS Generic"
- 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: "https://bdc1tlab01.research.att.com:5000"
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- appc:
- replicaCount: 3
- config:
- enableClustering: true
- sdnc:
- replicaCount: 3
- config:
- enableClustering: true
diff --git a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
deleted file mode 100644
index afc72bee9..000000000
--- a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
+++ /dev/null
@@ -1,45 +0,0 @@
-parameters:
-
- ubuntu_1604_image: "Ubuntu 16.04 LTS Generic"
-
- apt_proxy: 192.168.31.204:3142
- docker_proxy: 192.168.31.204:5000
-
- rancher_vm_flavor: m4.xlarge
- k8s_vm_flavor: m4.xlarge
-
- public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
-
- oam_network_cidr: 10.0.0.0/16
-
- integration_override_yaml: >
- global:
- repository: 192.168.31.204:5000
- pullPolicy: IfNotPresent
- robot:
- openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
- openStackPublicNetId: "__oam_network_id__"
- openStackPassword: "${OS_PASSWORD}"
- openStackTenantId: "${OS_PROJECT_ID}"
- openStackUserName: "${OS_USERNAME}"
- ubuntu14Image: "Ubuntu 14.04 LTS Generic"
- ubuntu16Image: "Ubuntu 16.04 LTS Generic"
- 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: "https://bdc1tlab01.research.att.com:5000"
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- appc:
- replicaCount: 3
- config:
- enableClustering: true
- sdnc:
- replicaCount: 3
- config:
- enableClustering: true
diff --git a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env b/deployment/heat/onap-oom/env/tlab/onap-oom.yaml
index afc72bee9..f1b490269 100644
--- a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.yaml
@@ -14,11 +14,11 @@ parameters:
integration_override_yaml: >
global:
- repository: 192.168.31.204:5000
+ repository: __docker_proxy__
pullPolicy: IfNotPresent
robot:
openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
- openStackPublicNetId: "__oam_network_id__"
+ openStackPublicNetId: "__oam_network_id__" # NOTE: for TLAB, openStackPublicNetId needs to be oam_network_id instead of public_net_id
openStackPassword: "${OS_PASSWORD}"
openStackTenantId: "${OS_PROJECT_ID}"
openStackUserName: "${OS_USERNAME}"
@@ -26,7 +26,7 @@ parameters:
ubuntu16Image: "Ubuntu 16.04 LTS Generic"
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"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Daily.env b/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Daily.env
deleted file mode 100644
index ebbfe689e..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Daily.env
+++ /dev/null
@@ -1,45 +0,0 @@
-parameters:
-
- ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-
- apt_proxy: 10.12.5.2:3142
- docker_proxy: 10.12.5.2:5000
-
- rancher_vm_flavor: m1.xlarge
- k8s_vm_flavor: m1.xlarge
-
- public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-
- oam_network_cidr: 10.0.0.0/16
-
- integration_override_yaml: >
- global:
- repository: 10.12.5.2:5000
- pullPolicy: IfNotPresent
- robot:
- openStackKeyStoneUrl: "http://10.12.25.2:5000"
- openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
- openStackPassword: "${OS_PASSWORD}"
- openStackTenantId: "${OS_PROJECT_ID}"
- openStackUserName: "${OS_USERNAME}"
- ubuntu14Image: "ubuntu-14-04-cloud-amd64"
- ubuntu16Image: "ubuntu-16-04-cloud-amd64"
- 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.12.25.2:5000"
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- appc:
- replicaCount: 3
- config:
- enableClustering: true
- sdnc:
- replicaCount: 3
- config:
- enableClustering: true
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Verify.env b/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Verify.env
deleted file mode 100644
index ebbfe689e..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Verify.env
+++ /dev/null
@@ -1,45 +0,0 @@
-parameters:
-
- ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-
- apt_proxy: 10.12.5.2:3142
- docker_proxy: 10.12.5.2:5000
-
- rancher_vm_flavor: m1.xlarge
- k8s_vm_flavor: m1.xlarge
-
- public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-
- oam_network_cidr: 10.0.0.0/16
-
- integration_override_yaml: >
- global:
- repository: 10.12.5.2:5000
- pullPolicy: IfNotPresent
- robot:
- openStackKeyStoneUrl: "http://10.12.25.2:5000"
- openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
- openStackPassword: "${OS_PASSWORD}"
- openStackTenantId: "${OS_PROJECT_ID}"
- openStackUserName: "${OS_USERNAME}"
- ubuntu14Image: "ubuntu-14-04-cloud-amd64"
- ubuntu16Image: "ubuntu-16-04-cloud-amd64"
- 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.12.25.2:5000"
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- appc:
- replicaCount: 3
- config:
- enableClustering: true
- sdnc:
- replicaCount: 3
- config:
- enableClustering: true
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-OOM-Daily.env b/deployment/heat/onap-oom/env/windriver/Integration-OOM-Daily.env
deleted file mode 100644
index ebbfe689e..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-OOM-Daily.env
+++ /dev/null
@@ -1,45 +0,0 @@
-parameters:
-
- ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-
- apt_proxy: 10.12.5.2:3142
- docker_proxy: 10.12.5.2:5000
-
- rancher_vm_flavor: m1.xlarge
- k8s_vm_flavor: m1.xlarge
-
- public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-
- oam_network_cidr: 10.0.0.0/16
-
- integration_override_yaml: >
- global:
- repository: 10.12.5.2:5000
- pullPolicy: IfNotPresent
- robot:
- openStackKeyStoneUrl: "http://10.12.25.2:5000"
- openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
- openStackPassword: "${OS_PASSWORD}"
- openStackTenantId: "${OS_PROJECT_ID}"
- openStackUserName: "${OS_USERNAME}"
- ubuntu14Image: "ubuntu-14-04-cloud-amd64"
- ubuntu16Image: "ubuntu-16-04-cloud-amd64"
- 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.12.25.2:5000"
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- appc:
- replicaCount: 3
- config:
- enableClustering: true
- sdnc:
- replicaCount: 3
- config:
- enableClustering: true
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily.env b/deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily.env
deleted file mode 100644
index ebbfe689e..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily.env
+++ /dev/null
@@ -1,45 +0,0 @@
-parameters:
-
- ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-
- apt_proxy: 10.12.5.2:3142
- docker_proxy: 10.12.5.2:5000
-
- rancher_vm_flavor: m1.xlarge
- k8s_vm_flavor: m1.xlarge
-
- public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-
- oam_network_cidr: 10.0.0.0/16
-
- integration_override_yaml: >
- global:
- repository: 10.12.5.2:5000
- pullPolicy: IfNotPresent
- robot:
- openStackKeyStoneUrl: "http://10.12.25.2:5000"
- openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
- openStackPassword: "${OS_PASSWORD}"
- openStackTenantId: "${OS_PROJECT_ID}"
- openStackUserName: "${OS_USERNAME}"
- ubuntu14Image: "ubuntu-14-04-cloud-amd64"
- ubuntu16Image: "ubuntu-16-04-cloud-amd64"
- 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.12.25.2:5000"
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- appc:
- replicaCount: 3
- config:
- enableClustering: true
- sdnc:
- replicaCount: 3
- config:
- enableClustering: true
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-OOM-Verify.env b/deployment/heat/onap-oom/env/windriver/Integration-OOM-Verify.env
deleted file mode 100644
index ebbfe689e..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-OOM-Verify.env
+++ /dev/null
@@ -1,45 +0,0 @@
-parameters:
-
- ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-
- apt_proxy: 10.12.5.2:3142
- docker_proxy: 10.12.5.2:5000
-
- rancher_vm_flavor: m1.xlarge
- k8s_vm_flavor: m1.xlarge
-
- public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-
- oam_network_cidr: 10.0.0.0/16
-
- integration_override_yaml: >
- global:
- repository: 10.12.5.2:5000
- pullPolicy: IfNotPresent
- robot:
- openStackKeyStoneUrl: "http://10.12.25.2:5000"
- openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
- openStackPassword: "${OS_PASSWORD}"
- openStackTenantId: "${OS_PROJECT_ID}"
- openStackUserName: "${OS_USERNAME}"
- ubuntu14Image: "ubuntu-14-04-cloud-amd64"
- ubuntu16Image: "ubuntu-16-04-cloud-amd64"
- 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.12.25.2:5000"
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- appc:
- replicaCount: 3
- config:
- enableClustering: true
- sdnc:
- replicaCount: 3
- config:
- enableClustering: true
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
deleted file mode 100644
index ebbfe689e..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
+++ /dev/null
@@ -1,45 +0,0 @@
-parameters:
-
- ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-
- apt_proxy: 10.12.5.2:3142
- docker_proxy: 10.12.5.2:5000
-
- rancher_vm_flavor: m1.xlarge
- k8s_vm_flavor: m1.xlarge
-
- public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-
- oam_network_cidr: 10.0.0.0/16
-
- integration_override_yaml: >
- global:
- repository: 10.12.5.2:5000
- pullPolicy: IfNotPresent
- robot:
- openStackKeyStoneUrl: "http://10.12.25.2:5000"
- openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
- openStackPassword: "${OS_PASSWORD}"
- openStackTenantId: "${OS_PROJECT_ID}"
- openStackUserName: "${OS_USERNAME}"
- ubuntu14Image: "ubuntu-14-04-cloud-amd64"
- ubuntu16Image: "ubuntu-16-04-cloud-amd64"
- 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.12.25.2:5000"
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- appc:
- replicaCount: 3
- config:
- enableClustering: true
- sdnc:
- replicaCount: 3
- config:
- enableClustering: true
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
deleted file mode 100644
index ebbfe689e..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
+++ /dev/null
@@ -1,45 +0,0 @@
-parameters:
-
- ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-
- apt_proxy: 10.12.5.2:3142
- docker_proxy: 10.12.5.2:5000
-
- rancher_vm_flavor: m1.xlarge
- k8s_vm_flavor: m1.xlarge
-
- public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-
- oam_network_cidr: 10.0.0.0/16
-
- integration_override_yaml: >
- global:
- repository: 10.12.5.2:5000
- pullPolicy: IfNotPresent
- robot:
- openStackKeyStoneUrl: "http://10.12.25.2:5000"
- openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
- openStackPassword: "${OS_PASSWORD}"
- openStackTenantId: "${OS_PROJECT_ID}"
- openStackUserName: "${OS_USERNAME}"
- ubuntu14Image: "ubuntu-14-04-cloud-amd64"
- ubuntu16Image: "ubuntu-16-04-cloud-amd64"
- 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.12.25.2:5000"
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- appc:
- replicaCount: 3
- config:
- enableClustering: true
- sdnc:
- replicaCount: 3
- config:
- enableClustering: true
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
deleted file mode 100644
index ebbfe689e..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
+++ /dev/null
@@ -1,45 +0,0 @@
-parameters:
-
- ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-
- apt_proxy: 10.12.5.2:3142
- docker_proxy: 10.12.5.2:5000
-
- rancher_vm_flavor: m1.xlarge
- k8s_vm_flavor: m1.xlarge
-
- public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-
- oam_network_cidr: 10.0.0.0/16
-
- integration_override_yaml: >
- global:
- repository: 10.12.5.2:5000
- pullPolicy: IfNotPresent
- robot:
- openStackKeyStoneUrl: "http://10.12.25.2:5000"
- openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
- openStackPassword: "${OS_PASSWORD}"
- openStackTenantId: "${OS_PROJECT_ID}"
- openStackUserName: "${OS_USERNAME}"
- ubuntu14Image: "ubuntu-14-04-cloud-amd64"
- ubuntu16Image: "ubuntu-16-04-cloud-amd64"
- 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.12.25.2:5000"
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- appc:
- replicaCount: 3
- config:
- enableClustering: true
- sdnc:
- replicaCount: 3
- config:
- enableClustering: true
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
deleted file mode 100644
index ebbfe689e..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
+++ /dev/null
@@ -1,45 +0,0 @@
-parameters:
-
- ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-
- apt_proxy: 10.12.5.2:3142
- docker_proxy: 10.12.5.2:5000
-
- rancher_vm_flavor: m1.xlarge
- k8s_vm_flavor: m1.xlarge
-
- public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-
- oam_network_cidr: 10.0.0.0/16
-
- integration_override_yaml: >
- global:
- repository: 10.12.5.2:5000
- pullPolicy: IfNotPresent
- robot:
- openStackKeyStoneUrl: "http://10.12.25.2:5000"
- openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
- openStackPassword: "${OS_PASSWORD}"
- openStackTenantId: "${OS_PROJECT_ID}"
- openStackUserName: "${OS_USERNAME}"
- ubuntu14Image: "ubuntu-14-04-cloud-amd64"
- ubuntu16Image: "ubuntu-16-04-cloud-amd64"
- 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.12.25.2:5000"
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- appc:
- replicaCount: 3
- config:
- enableClustering: true
- sdnc:
- replicaCount: 3
- config:
- enableClustering: true
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
deleted file mode 100644
index ebbfe689e..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
+++ /dev/null
@@ -1,45 +0,0 @@
-parameters:
-
- ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-
- apt_proxy: 10.12.5.2:3142
- docker_proxy: 10.12.5.2:5000
-
- rancher_vm_flavor: m1.xlarge
- k8s_vm_flavor: m1.xlarge
-
- public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-
- oam_network_cidr: 10.0.0.0/16
-
- integration_override_yaml: >
- global:
- repository: 10.12.5.2:5000
- pullPolicy: IfNotPresent
- robot:
- openStackKeyStoneUrl: "http://10.12.25.2:5000"
- openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
- openStackPassword: "${OS_PASSWORD}"
- openStackTenantId: "${OS_PROJECT_ID}"
- openStackUserName: "${OS_USERNAME}"
- ubuntu14Image: "ubuntu-14-04-cloud-amd64"
- ubuntu16Image: "ubuntu-16-04-cloud-amd64"
- 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.12.25.2:5000"
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- appc:
- replicaCount: 3
- config:
- enableClustering: true
- sdnc:
- replicaCount: 3
- config:
- enableClustering: true
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
deleted file mode 100644
index ebbfe689e..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
+++ /dev/null
@@ -1,45 +0,0 @@
-parameters:
-
- ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-
- apt_proxy: 10.12.5.2:3142
- docker_proxy: 10.12.5.2:5000
-
- rancher_vm_flavor: m1.xlarge
- k8s_vm_flavor: m1.xlarge
-
- public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-
- oam_network_cidr: 10.0.0.0/16
-
- integration_override_yaml: >
- global:
- repository: 10.12.5.2:5000
- pullPolicy: IfNotPresent
- robot:
- openStackKeyStoneUrl: "http://10.12.25.2:5000"
- openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
- openStackPassword: "${OS_PASSWORD}"
- openStackTenantId: "${OS_PROJECT_ID}"
- openStackUserName: "${OS_USERNAME}"
- ubuntu14Image: "ubuntu-14-04-cloud-amd64"
- ubuntu16Image: "ubuntu-16-04-cloud-amd64"
- 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.12.25.2:5000"
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- appc:
- replicaCount: 3
- config:
- enableClustering: true
- sdnc:
- replicaCount: 3
- config:
- enableClustering: true
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
deleted file mode 100644
index ebbfe689e..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
+++ /dev/null
@@ -1,45 +0,0 @@
-parameters:
-
- ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-
- apt_proxy: 10.12.5.2:3142
- docker_proxy: 10.12.5.2:5000
-
- rancher_vm_flavor: m1.xlarge
- k8s_vm_flavor: m1.xlarge
-
- public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-
- oam_network_cidr: 10.0.0.0/16
-
- integration_override_yaml: >
- global:
- repository: 10.12.5.2:5000
- pullPolicy: IfNotPresent
- robot:
- openStackKeyStoneUrl: "http://10.12.25.2:5000"
- openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
- openStackPassword: "${OS_PASSWORD}"
- openStackTenantId: "${OS_PROJECT_ID}"
- openStackUserName: "${OS_USERNAME}"
- ubuntu14Image: "ubuntu-14-04-cloud-amd64"
- ubuntu16Image: "ubuntu-16-04-cloud-amd64"
- 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.12.25.2:5000"
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- appc:
- replicaCount: 3
- config:
- enableClustering: true
- sdnc:
- replicaCount: 3
- config:
- enableClustering: true
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
deleted file mode 100644
index ebbfe689e..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
+++ /dev/null
@@ -1,45 +0,0 @@
-parameters:
-
- ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-
- apt_proxy: 10.12.5.2:3142
- docker_proxy: 10.12.5.2:5000
-
- rancher_vm_flavor: m1.xlarge
- k8s_vm_flavor: m1.xlarge
-
- public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-
- oam_network_cidr: 10.0.0.0/16
-
- integration_override_yaml: >
- global:
- repository: 10.12.5.2:5000
- pullPolicy: IfNotPresent
- robot:
- openStackKeyStoneUrl: "http://10.12.25.2:5000"
- openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
- openStackPassword: "${OS_PASSWORD}"
- openStackTenantId: "${OS_PROJECT_ID}"
- openStackUserName: "${OS_USERNAME}"
- ubuntu14Image: "ubuntu-14-04-cloud-amd64"
- ubuntu16Image: "ubuntu-16-04-cloud-amd64"
- 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.12.25.2:5000"
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- appc:
- replicaCount: 3
- config:
- enableClustering: true
- sdnc:
- replicaCount: 3
- config:
- enableClustering: true
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index ebbfe689e..c1f0ccbcf 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -14,11 +14,11 @@ parameters:
integration_override_yaml: >
global:
- repository: 10.12.5.2:5000
+ repository: __docker_proxy__
pullPolicy: IfNotPresent
robot:
openStackKeyStoneUrl: "http://10.12.25.2:5000"
- openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+ openStackPublicNetId: "__public_net_id__"
openStackPassword: "${OS_PASSWORD}"
openStackTenantId: "${OS_PROJECT_ID}"
openStackUserName: "${OS_USERNAME}"
@@ -26,7 +26,7 @@ parameters:
ubuntu16Image: "ubuntu-16-04-cloud-amd64"
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"
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml
index 23d930ba6..34e71fd79 100644
--- a/deployment/heat/onap-oom/onap-oom.yaml
+++ b/deployment/heat/onap-oom/onap-oom.yaml
@@ -155,6 +155,8 @@ resources:
__gerrit_branch__: { get_param: gerrit_branch }
__gerrit_refspec__: { get_param: gerrit_refspec }
__docker_manifest__: { get_param: docker_manifest }
+ __public_net_id__: { get_param: public_net_id }
+ __oam_network_cidr__: { get_param: oam_network_cidr }
__oam_network_id__: { get_resource: oam_network }
__oam_subnet_id__: { get_resource: oam_subnet }
__k8s_1_vm_ip__: { get_attr: [k8s_1_floating_ip, floating_ip_address] }
diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
index 89f942739..ffc4fd5f6 100644
--- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
@@ -14,19 +14,26 @@ printenv
mkdir -p /opt/config
echo "__rancher_ip_addr__" > /opt/config/rancher_ip_addr.txt
echo "__k8s_vm_ips__" > /opt/config/k8s_vm_ips.txt
+echo "__public_net_id__" > /opt/config/public_net_id.txt
+echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
echo "__oam_network_id__" > /opt/config/oam_network_id.txt
echo "__oam_subnet_id__" > /opt/config/oam_subnet_id.txt
echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
echo "__gerrit_refspec__" > /opt/config/gerrit_refspec.txt
echo "__docker_manifest__" > /opt/config/docker_manifest.txt
+echo "__docker_proxy__" > /opt/config/docker_proxy.txt
cat <<EOF > /opt/config/integration-override.yaml
__integration_override_yaml__
EOF
+sed -i 's/\_\_public_net_id__/__public_net_id__/g' /opt/config/integration-override.yaml
+sed -i 's|\_\_oam_network_cidr__|__oam_network_cidr__|g' /opt/config/integration-override.yaml
sed -i 's/\_\_oam_network_id__/__oam_network_id__/g' /opt/config/integration-override.yaml
sed -i 's/\_\_oam_subnet_id__/__oam_subnet_id__/g' /opt/config/integration-override.yaml
sed -i 's/\_\_k8s_1_vm_ip__/__k8s_1_vm_ip__/g' /opt/config/integration-override.yaml
+sed -i 's/\_\_docker_proxy__/__docker_proxy__/g' /opt/config/integration-override.yaml
cp /opt/config/integration-override.yaml /root
+cat /root/integration-override.yaml
echo `hostname -I` `hostname` >> /etc/hosts
mkdir -p /etc/docker
@@ -187,6 +194,9 @@ done
# Install using OOM
export HOME=/root
+mkdir -p ~/.ssh
+cp ~ubuntu/.ssh/authorized_keys ~/.ssh
+
# update and initialize git
apt-get -y install git
diff --git a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
index 839992426..e4968e048 100755
--- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
+++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
@@ -53,6 +53,8 @@ cat <<EOF
__gerrit_branch__: { get_param: gerrit_branch }
__gerrit_refspec__: { get_param: gerrit_refspec }
__docker_manifest__: { get_param: docker_manifest }
+ __public_net_id__: { get_param: public_net_id }
+ __oam_network_cidr__: { get_param: oam_network_cidr }
__oam_network_id__: { get_resource: oam_network }
__oam_subnet_id__: { get_resource: oam_subnet }
__k8s_1_vm_ip__: { get_attr: [k8s_1_floating_ip, floating_ip_address] }