aboutsummaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
Diffstat (limited to 'deployment')
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-00.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-01.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-02.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-03.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-04.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-05.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-06.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-07.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/integration-override-minimal.yaml136
-rwxr-xr-xdeployment/heat/onap-oom/scripts/deploy.sh4
11 files changed, 147 insertions, 11 deletions
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
index d80b8a54b..ff2f4e063 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
@@ -15,7 +15,7 @@ parameters:
docker_proxy: 10.12.5.2:5000
rancher_vm_flavor: m1.large
- k8s_vm_flavor: m1.xxlarge
+ k8s_vm_flavor: m2.xxlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
public_net_name: external
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
index 16965979f..3139bcf19 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
@@ -15,7 +15,7 @@ parameters:
docker_proxy: 10.12.5.2:5000
rancher_vm_flavor: m1.large
- k8s_vm_flavor: m1.xxlarge
+ k8s_vm_flavor: m2.xxlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
public_net_name: external
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
index 8e851913c..cd9509607 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
@@ -15,7 +15,7 @@ parameters:
docker_proxy: 10.12.5.2:5000
rancher_vm_flavor: m1.large
- k8s_vm_flavor: m1.xxlarge
+ k8s_vm_flavor: m2.xxlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
public_net_name: external
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
index 99d267bc6..bc113a89d 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
@@ -15,7 +15,7 @@ parameters:
docker_proxy: 10.12.5.2:5000
rancher_vm_flavor: m1.large
- k8s_vm_flavor: m1.xxlarge
+ k8s_vm_flavor: m2.xxlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
public_net_name: external
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
index 89fc801ba..e05143e8d 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
@@ -15,7 +15,7 @@ parameters:
docker_proxy: 10.12.5.2:5000
rancher_vm_flavor: m1.large
- k8s_vm_flavor: m1.xxlarge
+ k8s_vm_flavor: m2.xxlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
public_net_name: external
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
index ec4227e7d..2c00ad630 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
@@ -15,7 +15,7 @@ parameters:
docker_proxy: 10.12.5.2:5000
rancher_vm_flavor: m1.large
- k8s_vm_flavor: m1.xxlarge
+ k8s_vm_flavor: m2.xxlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
public_net_name: external
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
index af6c5fe23..1a1bfa56a 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
@@ -15,7 +15,7 @@ parameters:
docker_proxy: 10.12.5.2:5000
rancher_vm_flavor: m1.large
- k8s_vm_flavor: m1.xxlarge
+ k8s_vm_flavor: m2.xxlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
public_net_name: external
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
index 72ddd4172..184a21110 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
@@ -15,7 +15,7 @@ parameters:
docker_proxy: 10.12.5.2:5000
rancher_vm_flavor: m1.large
- k8s_vm_flavor: m1.xxlarge
+ k8s_vm_flavor: m2.xxlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
public_net_name: external
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
index 6c5f23aa5..8df843503 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
@@ -15,7 +15,7 @@ parameters:
docker_proxy: 10.12.5.2:5000
rancher_vm_flavor: m1.large
- k8s_vm_flavor: m1.xxlarge
+ k8s_vm_flavor: m2.xxlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
public_net_name: external
diff --git a/deployment/heat/onap-oom/env/windriver/integration-override-minimal.yaml b/deployment/heat/onap-oom/env/windriver/integration-override-minimal.yaml
new file mode 100644
index 000000000..eecda75ba
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/integration-override-minimal.yaml
@@ -0,0 +1,136 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This override file is useful to test one or more subcharts.
+# It overrides the default ONAP parent chart behaviour to deploy
+# all of ONAP.
+#
+# Example use to enable a single subchart (from this directory):
+#
+# helm install local/onap -n onap --namespace onap -f disable-allcharts.yaml --set so.enabled=true
+
+
+#################################################################
+# Global configuration overrides.
+#
+# These overrides will affect all helm charts (ie. applications)
+# that are listed below and are 'enabled'.
+#################################################################
+global:
+ # Change to an unused port prefix range to prevent port conflicts
+ # with other instances running within the same k8s cluster
+ nodePortPrefix: 302
+
+ # windriver local nexus proxy - nexus3 default
+ repository: 10.12.5.2:5000
+ # image pull policy
+ #pullPolicy: Always
+ pullPolicy: IfNotPresent
+
+
+ # default mount path root directory referenced
+ # by persistent volumes and log files
+# persistence:
+# mountPath: /onapdata
+
+#################################################################
+# Enable/disable and configure helm charts (ie. applications)
+# to customize the ONAP deployment.
+#################################################################
+aaf:
+ enabled: true
+aai:
+ enabled: true
+ # aai subchart image overrides
+ aai-champ:
+ image: onap/champ:1.2-STAGING-latest
+ aai-data-router:
+ image: onap/data-router:1.2-STAGING-latest
+ aai-modelloader:
+ image: onap/model-loader:1.2-STAGING-latest
+ aai-resources:
+ image: onap/aai-resources:1.2-STAGING-latest
+ aai-search-data:
+ image: onap/search-data-service:1.2-STAGING-latest
+ aai-sparky-be:
+ image: onap/sparky-be:1.2-STAGING-latest
+ aai-traveral:
+ image: onap/aai-traversal:1.2-STAGING-latest
+appc:
+ enabled: false
+clamp:
+ enabled: true
+cli:
+ enabled: false
+consul:
+ enabled: true
+dcaegen2:
+ enabled: false
+esr:
+ enabled: false
+ # esr parent chart (server) image override
+ image: onap/aai/esr-server:1.1.0-SNAPSHOT
+ # esr subchart omage override
+ esr-gui:
+ image: onap/aai/esr-gui:1.1.0-SNAPSHOT
+log:
+ enabled: true
+message-router:
+ enabled: true
+# kafka:
+# repositoryOverride: docker.io
+# image: wurstmeister/kafka:latest
+mock:
+ enabled: true
+msb:
+ enabled: true
+multicloud:
+ enabled: true
+policy:
+ enabled: true
+portal:
+ enabled: true
+robot:
+ enabled: true
+ #pullPolicy: Always
+# config:
+ # openstack configuration
+# openStackUserName: "demo"
+# openStackRegion: "RegionOne"
+# openStackKeyStoneUrl: "http://10.12.25.2:5000"
+# openStackServiceTenantName: "service"
+# openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
+sdc:
+ enabled: true
+sdnc:
+ enabled: true
+so:
+ enabled: true
+ # so server configuration
+ config:
+ # openstack configuration
+ openStackUserName: "demo"
+ openStackRegion: "RegionOne"
+ openStackKeyStoneUrl: "http://10.12.25.2:5000"
+ openStackServiceTenantName: "service"
+ openStackEncryptedPasswordHere: "bbaef6cd76625ab9eb60deedeae7dbb9"
+
+uui:
+ enabled: false
+vfc:
+ enabled: false
+vid:
+ enabled: true
+vnfsdk:
+ enabled: false
diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh
index c49239403..056174d28 100755
--- a/deployment/heat/onap-oom/scripts/deploy.sh
+++ b/deployment/heat/onap-oom/scripts/deploy.sh
@@ -19,8 +19,8 @@ for n in $(seq 1 5); do
envsubst < $ENV_FILE > $ENV_FILE~
openstack stack create -t ./onap-oom.yaml -e $ENV_FILE~ onap-oom
- for i in $(seq 1 10); do
- sleep 10
+ for i in $(seq 1 30); do
+ sleep 30
K8S_IP=$(openstack stack output show onap-oom k8s_vm_ip -c output_value -f value)
RANCHER_IP=$(openstack stack output show onap-oom rancher_vm_ip -c output_value -f value)
timeout 1 ping -c 1 "$K8S_IP" && timeout 1 ping -c 1 "$RANCHER_IP" && break