summaryrefslogtreecommitdiffstats
path: root/deployment/heat/onap-oom/env/windriver
diff options
context:
space:
mode:
Diffstat (limited to 'deployment/heat/onap-oom/env/windriver')
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-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-Daily.env)6
14 files changed, 3 insertions, 588 deletions
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily.env b/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily.env
deleted file mode 100644
index ebbfe689e..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-HEAT-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-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-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-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"