summaryrefslogtreecommitdiffstats
path: root/deployment/heat
diff options
context:
space:
mode:
Diffstat (limited to 'deployment/heat')
-rw-r--r--deployment/heat/onap-oom/env/default/integration-override.yaml139
-rw-r--r--deployment/heat/onap-oom/env/gwu/onap.env27
-rw-r--r--deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env27
-rw-r--r--deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env25
-rw-r--r--deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env25
-rw-r--r--deployment/heat/onap-oom/env/tlab/integration-override.yaml121
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env25
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-00.env25
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-01.env25
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-02.env27
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-03.env25
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-04.env25
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-05.env25
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-06.env25
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-07.env25
-rw-r--r--deployment/heat/onap-oom/env/windriver/integration-override-minimal.yaml136
-rw-r--r--deployment/heat/onap-oom/env/windriver/integration-override.yaml136
-rw-r--r--deployment/heat/onap-oom/k8s_vm_entrypoint.sh9
-rw-r--r--deployment/heat/onap-oom/onap-oom.yaml33
-rw-r--r--deployment/heat/onap-oom/parts/onap-oom-1.yaml19
-rw-r--r--deployment/heat/onap-oom/parts/onap-oom-2.yaml1
-rw-r--r--deployment/heat/onap-oom/rancher_vm_entrypoint.sh43
-rwxr-xr-xdeployment/heat/onap-oom/scripts/deploy.sh3
-rwxr-xr-xdeployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh10
24 files changed, 340 insertions, 641 deletions
diff --git a/deployment/heat/onap-oom/env/default/integration-override.yaml b/deployment/heat/onap-oom/env/default/integration-override.yaml
deleted file mode 100644
index 5341be1cf..000000000
--- a/deployment/heat/onap-oom/env/default/integration-override.yaml
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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
-
- # local nexus proxy - nexus3 default
- repository: nexus3.onap.org:10001
- # 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: true
-clamp:
- enabled: true
-cli:
- enabled: true
-consul:
- enabled: true
-dcaegen2:
- enabled: false
-esr:
- enabled: true
- # 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"
- openStackPassword: "onapdemo"
- openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
- openStackTenantId: "d570c718cbc545029f40e50b75eb13df"
-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: true
-vfc:
- enabled: true
-vid:
- enabled: true
-vnfsdk:
- enabled: true
diff --git a/deployment/heat/onap-oom/env/gwu/onap.env b/deployment/heat/onap-oom/env/gwu/onap.env
index 6e7c7c4df..d973f90fe 100644
--- a/deployment/heat/onap-oom/env/gwu/onap.env
+++ b/deployment/heat/onap-oom/env/gwu/onap.env
@@ -1,9 +1,7 @@
parameters:
- ubuntu_1404_image: trusty
ubuntu_1604_image: xenial
- lab_name: gwu
apt_proxy: 192.168.1.51:3142
docker_proxy: 192.168.1.51:5000
@@ -11,6 +9,27 @@ parameters:
k8s_vm_flavor: m1.xlarge
public_net_id: 024582bd-ef9b-48b9-9e70-e6732559d9df
- public_net_name: provider
- oam_network_cidr: 172.16.0.0/16
+ oam_network_cidr: 10.0.0.0/16
+
+ integration_override_yaml: >
+ global:
+ repository: 192.168.1.51:5000
+ pullPolicy: IfNotPresent
+ robot:
+ openStackKeyStoneUrl: "http://192.168.1.11:5000"
+ openStackPublicNetId: "024582bd-ef9b-48b9-9e70-e6732559d9df"
+ 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"
+ so:
+ config:
+ openStackUserName: "${OS_USERNAME}"
+ openStackKeyStoneUrl: "http://192.168.1.11:5000"
+ openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
index 98e909f70..2dae2822e 100644
--- a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
+++ b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
@@ -1,9 +1,7 @@
parameters:
- ubuntu_1404_image: trusty
ubuntu_1604_image: xenial
- lab_name: huawei
apt_proxy: 10.145.122.118:3142
docker_proxy: 10.145.122.118:5000
@@ -11,6 +9,27 @@ parameters:
k8s_vm_flavor: m1.xlarge
public_net_id: 3a6247f1-fac6-4167-a49f-33cc8415ccf4
- public_net_name: provider
- oam_network_cidr: 172.16.0.0/16
+ oam_network_cidr: 10.0.0.0/16
+
+ integration_override_yaml: >
+ global:
+ repository: 10.145.122.118:5000
+ pullPolicy: IfNotPresent
+ robot:
+ openStackKeyStoneUrl: "http://10.145.122.117: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"
+ so:
+ config:
+ openStackUserName: "${OS_USERNAME}"
+ openStackKeyStoneUrl: "http://10.145.122.117:5000"
+ openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
index eb0afc41f..59e0598cc 100644
--- a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
+++ b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
@@ -1,9 +1,7 @@
parameters:
- ubuntu_1404_image: "Ubuntu 14.04 LTS Generic"
ubuntu_1604_image: "Ubuntu 16.04 LTS Generic"
- lab_name: tlab
apt_proxy: 192.168.31.204:3142
docker_proxy: 192.168.31.204:5000
@@ -11,6 +9,27 @@ parameters:
k8s_vm_flavor: m1.xlarge
public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
- public_net_name: admin-vpn-floating
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: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9"
+ 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"
+ so:
+ config:
+ openStackUserName: "${OS_USERNAME}"
+ openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+ openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
index eb0afc41f..59e0598cc 100644
--- a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
+++ b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
@@ -1,9 +1,7 @@
parameters:
- ubuntu_1404_image: "Ubuntu 14.04 LTS Generic"
ubuntu_1604_image: "Ubuntu 16.04 LTS Generic"
- lab_name: tlab
apt_proxy: 192.168.31.204:3142
docker_proxy: 192.168.31.204:5000
@@ -11,6 +9,27 @@ parameters:
k8s_vm_flavor: m1.xlarge
public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
- public_net_name: admin-vpn-floating
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: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9"
+ 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"
+ so:
+ config:
+ openStackUserName: "${OS_USERNAME}"
+ openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+ openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/tlab/integration-override.yaml b/deployment/heat/onap-oom/env/tlab/integration-override.yaml
deleted file mode 100644
index c56d139e9..000000000
--- a/deployment/heat/onap-oom/env/tlab/integration-override.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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
-
- # lab local nexus proxy - nexus3 default
- repository: 192.168.31.204: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
-appc:
- enabled: true
-clamp:
- enabled: true
-cli:
- enabled: true
-consul:
- enabled: true
-dcaegen2:
- enabled: false
-esr:
- enabled: true
- # 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: "gw3113"
- openStackRegion: "RegionOne"
- openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
- openStackServiceTenantName: "service"
- openStackEncryptedPasswordHere: "05daa77613ae3690172d9f822883dda9"
-sdc:
- enabled: true
-sdnc:
- enabled: true
-so:
- enabled: true
- # so server configuration
- config:
- # openstack configuration
- openStackUserName: "gw3113"
- openStackRegion: "RegionOne"
- openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
- openStackServiceTenantName: "service"
- openStackEncryptedPasswordHere: "05daa77613ae3690172d9f822883dda9"
-
-uui:
- enabled: true
-vfc:
- enabled: true
-vid:
- enabled: true
-vnfsdk:
- enabled: true
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
index e4fd54d4c..d2a8c29e5 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
@@ -1,9 +1,7 @@
parameters:
- ubuntu_1404_image: ubuntu-14-04-cloud-amd64
ubuntu_1604_image: ubuntu-16-04-cloud-amd64
- lab_name: windriver
apt_proxy: 10.12.5.2:3142
docker_proxy: 10.12.5.2:5000
@@ -11,6 +9,27 @@ parameters:
k8s_vm_flavor: m1.xlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
- public_net_name: external
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"
+ so:
+ config:
+ openStackUserName: "${OS_USERNAME}"
+ openStackKeyStoneUrl: "http://10.12.25.2:5000"
+ openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
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 e4fd54d4c..d2a8c29e5 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
@@ -1,9 +1,7 @@
parameters:
- ubuntu_1404_image: ubuntu-14-04-cloud-amd64
ubuntu_1604_image: ubuntu-16-04-cloud-amd64
- lab_name: windriver
apt_proxy: 10.12.5.2:3142
docker_proxy: 10.12.5.2:5000
@@ -11,6 +9,27 @@ parameters:
k8s_vm_flavor: m1.xlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
- public_net_name: external
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"
+ so:
+ config:
+ openStackUserName: "${OS_USERNAME}"
+ openStackKeyStoneUrl: "http://10.12.25.2:5000"
+ openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
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 e4fd54d4c..d2a8c29e5 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
@@ -1,9 +1,7 @@
parameters:
- ubuntu_1404_image: ubuntu-14-04-cloud-amd64
ubuntu_1604_image: ubuntu-16-04-cloud-amd64
- lab_name: windriver
apt_proxy: 10.12.5.2:3142
docker_proxy: 10.12.5.2:5000
@@ -11,6 +9,27 @@ parameters:
k8s_vm_flavor: m1.xlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
- public_net_name: external
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"
+ so:
+ config:
+ openStackUserName: "${OS_USERNAME}"
+ openStackKeyStoneUrl: "http://10.12.25.2:5000"
+ openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
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 53e26f017..d2a8c29e5 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
@@ -1,9 +1,7 @@
parameters:
- ubuntu_1404_image: ubuntu-14-04-cloud-amd64
ubuntu_1604_image: ubuntu-16-04-cloud-amd64
- lab_name: windriver
apt_proxy: 10.12.5.2:3142
docker_proxy: 10.12.5.2:5000
@@ -11,6 +9,27 @@ parameters:
k8s_vm_flavor: m1.xlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
- public_net_name: external
- oam_network_cidr: 172.16.0.0/16
+ 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"
+ so:
+ config:
+ openStackUserName: "${OS_USERNAME}"
+ openStackKeyStoneUrl: "http://10.12.25.2:5000"
+ openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
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 e4fd54d4c..d2a8c29e5 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
@@ -1,9 +1,7 @@
parameters:
- ubuntu_1404_image: ubuntu-14-04-cloud-amd64
ubuntu_1604_image: ubuntu-16-04-cloud-amd64
- lab_name: windriver
apt_proxy: 10.12.5.2:3142
docker_proxy: 10.12.5.2:5000
@@ -11,6 +9,27 @@ parameters:
k8s_vm_flavor: m1.xlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
- public_net_name: external
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"
+ so:
+ config:
+ openStackUserName: "${OS_USERNAME}"
+ openStackKeyStoneUrl: "http://10.12.25.2:5000"
+ openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
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 e4fd54d4c..d2a8c29e5 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
@@ -1,9 +1,7 @@
parameters:
- ubuntu_1404_image: ubuntu-14-04-cloud-amd64
ubuntu_1604_image: ubuntu-16-04-cloud-amd64
- lab_name: windriver
apt_proxy: 10.12.5.2:3142
docker_proxy: 10.12.5.2:5000
@@ -11,6 +9,27 @@ parameters:
k8s_vm_flavor: m1.xlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
- public_net_name: external
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"
+ so:
+ config:
+ openStackUserName: "${OS_USERNAME}"
+ openStackKeyStoneUrl: "http://10.12.25.2:5000"
+ openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
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 e4fd54d4c..d2a8c29e5 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
@@ -1,9 +1,7 @@
parameters:
- ubuntu_1404_image: ubuntu-14-04-cloud-amd64
ubuntu_1604_image: ubuntu-16-04-cloud-amd64
- lab_name: windriver
apt_proxy: 10.12.5.2:3142
docker_proxy: 10.12.5.2:5000
@@ -11,6 +9,27 @@ parameters:
k8s_vm_flavor: m1.xlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
- public_net_name: external
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"
+ so:
+ config:
+ openStackUserName: "${OS_USERNAME}"
+ openStackKeyStoneUrl: "http://10.12.25.2:5000"
+ openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
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 e4fd54d4c..d2a8c29e5 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
@@ -1,9 +1,7 @@
parameters:
- ubuntu_1404_image: ubuntu-14-04-cloud-amd64
ubuntu_1604_image: ubuntu-16-04-cloud-amd64
- lab_name: windriver
apt_proxy: 10.12.5.2:3142
docker_proxy: 10.12.5.2:5000
@@ -11,6 +9,27 @@ parameters:
k8s_vm_flavor: m1.xlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
- public_net_name: external
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"
+ so:
+ config:
+ openStackUserName: "${OS_USERNAME}"
+ openStackKeyStoneUrl: "http://10.12.25.2:5000"
+ openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
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 e4fd54d4c..d2a8c29e5 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
@@ -1,9 +1,7 @@
parameters:
- ubuntu_1404_image: ubuntu-14-04-cloud-amd64
ubuntu_1604_image: ubuntu-16-04-cloud-amd64
- lab_name: windriver
apt_proxy: 10.12.5.2:3142
docker_proxy: 10.12.5.2:5000
@@ -11,6 +9,27 @@ parameters:
k8s_vm_flavor: m1.xlarge
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
- public_net_name: external
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"
+ so:
+ config:
+ openStackUserName: "${OS_USERNAME}"
+ openStackKeyStoneUrl: "http://10.12.25.2:5000"
+ openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/integration-override-minimal.yaml b/deployment/heat/onap-oom/env/windriver/integration-override-minimal.yaml
deleted file mode 100644
index 7e1204685..000000000
--- a/deployment/heat/onap-oom/env/windriver/integration-override-minimal.yaml
+++ /dev/null
@@ -1,136 +0,0 @@
-# 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: true
-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/env/windriver/integration-override.yaml b/deployment/heat/onap-oom/env/windriver/integration-override.yaml
deleted file mode 100644
index 31c28fe41..000000000
--- a/deployment/heat/onap-oom/env/windriver/integration-override.yaml
+++ /dev/null
@@ -1,136 +0,0 @@
-# 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: true
-consul:
- enabled: true
-dcaegen2:
- enabled: false
-esr:
- enabled: true
- # 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: true
-vfc:
- enabled: true
-vid:
- enabled: true
-vnfsdk:
- enabled: true
diff --git a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
index 79d7db5cf..1ec659c0e 100644
--- a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
@@ -3,7 +3,9 @@ printenv
mkdir -p /opt/config
echo "__rancher_ip_addr__" > /opt/config/rancher_ip_addr.txt
-echo `hostname -I` `hostname` >> /etc/hosts
+HOST_IP=$(hostname -I)
+echo $HOST_IP `hostname` >> /etc/hosts
+
mkdir -p /etc/docker
if [ ! -z "__docker_proxy__" ]; then
cat > /etc/docker/daemon.json <<EOF
@@ -41,5 +43,6 @@ while [ ! -e /dockerdata-nfs/rancher_agent_cmd.sh ]; do
mount /dockerdata-nfs
sleep 5
done
-source /dockerdata-nfs/rancher_agent_cmd.sh
-
+cp /dockerdata-nfs/rancher_agent_cmd.sh .
+sed -i "s/docker run/docker run -e CATTLE_AGENT_IP=${HOST_IP}/g" rancher_agent_cmd.sh
+source rancher_agent_cmd.sh
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml
index aca3aa5dd..44bf799ff 100644
--- a/deployment/heat/onap-oom/onap-oom.yaml
+++ b/deployment/heat/onap-oom/onap-oom.yaml
@@ -1,10 +1,10 @@
+#
+# Generated by scripts/gen-onap-oom-yaml.sh; MANUAL CHANGES WILL BE LOST
+#
heat_template_version: 2015-10-15
description: ONAP on Kubernetes using OOM
parameters:
- lab_name:
- type: string
-
docker_proxy:
type: string
@@ -15,29 +15,25 @@ parameters:
type: string
description: The ID of the Public network for floating IP address allocation
- public_net_name:
- type: string
- description: The name of the Public network referred by public_net_id
-
oam_network_cidr:
type: string
description: CIDR of the OAM ONAP network
- ubuntu_1404_image:
- type: string
- description: Name of the Ubuntu 14.04 image
-
ubuntu_1604_image:
type: string
description: Name of the Ubuntu 16.04 image
rancher_vm_flavor:
type: string
- description: Name of the Ubuntu 14.04 image
+ description: VM flavor for Rancher
k8s_vm_flavor:
type: string
- description: Name of the Ubuntu 14.04 image
+ description: VM flavor for k8s hosts
+
+ integration_override_yaml:
+ type: string
+ description: Content for integration_override.yaml
resources:
random-str:
@@ -136,10 +132,12 @@ resources:
template:
get_file: rancher_vm_entrypoint.sh
params:
- __lab_name__: { get_param: lab_name }
__docker_proxy__: { get_param: docker_proxy }
__apt_proxy__: { get_param: apt_proxy }
__rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
+ __integration_override_yaml__: { get_param: integration_override_yaml }
+ __oam_network_id__: { get_resource: oam_network }
+ __oam_subnet_id__: { get_resource: oam_subnet }
__k8s_vm_ips__: [
get_attr: [k8s_1_floating_ip, floating_ip_address],
get_attr: [k8s_2_floating_ip, floating_ip_address],
@@ -176,7 +174,6 @@ resources:
user_data:
str_replace:
params:
- __lab_name__: { get_param: lab_name }
__docker_proxy__: { get_param: docker_proxy }
__apt_proxy__: { get_param: apt_proxy }
__rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
@@ -210,7 +207,6 @@ resources:
user_data:
str_replace:
params:
- __lab_name__: { get_param: lab_name }
__docker_proxy__: { get_param: docker_proxy }
__apt_proxy__: { get_param: apt_proxy }
__rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
@@ -244,7 +240,6 @@ resources:
user_data:
str_replace:
params:
- __lab_name__: { get_param: lab_name }
__docker_proxy__: { get_param: docker_proxy }
__apt_proxy__: { get_param: apt_proxy }
__rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
@@ -278,7 +273,6 @@ resources:
user_data:
str_replace:
params:
- __lab_name__: { get_param: lab_name }
__docker_proxy__: { get_param: docker_proxy }
__apt_proxy__: { get_param: apt_proxy }
__rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
@@ -312,7 +306,6 @@ resources:
user_data:
str_replace:
params:
- __lab_name__: { get_param: lab_name }
__docker_proxy__: { get_param: docker_proxy }
__apt_proxy__: { get_param: apt_proxy }
__rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
@@ -346,7 +339,6 @@ resources:
user_data:
str_replace:
params:
- __lab_name__: { get_param: lab_name }
__docker_proxy__: { get_param: docker_proxy }
__apt_proxy__: { get_param: apt_proxy }
__rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
@@ -380,7 +372,6 @@ resources:
user_data:
str_replace:
params:
- __lab_name__: { get_param: lab_name }
__docker_proxy__: { get_param: docker_proxy }
__apt_proxy__: { get_param: apt_proxy }
__rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
diff --git a/deployment/heat/onap-oom/parts/onap-oom-1.yaml b/deployment/heat/onap-oom/parts/onap-oom-1.yaml
index ef408b48e..e29f6cd81 100644
--- a/deployment/heat/onap-oom/parts/onap-oom-1.yaml
+++ b/deployment/heat/onap-oom/parts/onap-oom-1.yaml
@@ -2,9 +2,6 @@ heat_template_version: 2015-10-15
description: ONAP on Kubernetes using OOM
parameters:
- lab_name:
- type: string
-
docker_proxy:
type: string
@@ -15,29 +12,25 @@ parameters:
type: string
description: The ID of the Public network for floating IP address allocation
- public_net_name:
- type: string
- description: The name of the Public network referred by public_net_id
-
oam_network_cidr:
type: string
description: CIDR of the OAM ONAP network
- ubuntu_1404_image:
- type: string
- description: Name of the Ubuntu 14.04 image
-
ubuntu_1604_image:
type: string
description: Name of the Ubuntu 16.04 image
rancher_vm_flavor:
type: string
- description: Name of the Ubuntu 14.04 image
+ description: VM flavor for Rancher
k8s_vm_flavor:
type: string
- description: Name of the Ubuntu 14.04 image
+ description: VM flavor for k8s hosts
+
+ integration_override_yaml:
+ type: string
+ description: Content for integration_override.yaml
resources:
random-str:
diff --git a/deployment/heat/onap-oom/parts/onap-oom-2.yaml b/deployment/heat/onap-oom/parts/onap-oom-2.yaml
index cdc2247a1..7ee9021af 100644
--- a/deployment/heat/onap-oom/parts/onap-oom-2.yaml
+++ b/deployment/heat/onap-oom/parts/onap-oom-2.yaml
@@ -25,7 +25,6 @@
user_data:
str_replace:
params:
- __lab_name__: { get_param: lab_name }
__docker_proxy__: { get_param: docker_proxy }
__apt_proxy__: { get_param: apt_proxy }
__rancher_ip_addr__: { get_attr: [rancher_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 2babb28c2..a729b6bab 100644
--- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
@@ -4,6 +4,15 @@ 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 "__oam_network_id__" > /opt/config/oam_network_id.txt
+echo "__oam_subnet_id__" > /opt/config/oam_subnet_id.txt
+
+cat <<EOF > /opt/config/integration-override.yaml
+__integration_override_yaml__
+EOF
+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
+cp /opt/config/integration-override.yaml /root
echo `hostname -I` `hostname` >> /etc/hosts
mkdir -p /etc/docker
@@ -30,7 +39,7 @@ chmod 777 /dockerdata-nfs/
chown nobody:nogroup /dockerdata-nfs/
cd /dockerdata-nfs/
git init
-git config user.email "root@k8s"
+git config user.email "root@onap"
git config user.name "root"
git add -A
git commit -m "initial commit"
@@ -118,6 +127,10 @@ done
jq -r .command token.json > rancher_agent_cmd.sh
chmod +x rancher_agent_cmd.sh
cp rancher_agent_cmd.sh /dockerdata-nfs
+cd /dockerdata-nfs
+git add -A
+git commit -a -m "Add rancher agent command file"
+cd ~
KUBETOKEN=$(echo -n 'Basic '$(echo -n "$RANCHER_ACCESS_KEY:$RANCHER_SECRET_KEY" | base64 -w 0) | base64 -w 0)
@@ -163,30 +176,8 @@ git clone -b master http://gerrit.onap.org/r/oom
cd oom
git log -1
-# Update values.yaml to point to docker-proxy instead of nexus3:
-cd ~/oom/kubernetes
-#perl -p -i -e 's/nexus3.onap.org:10001/__docker_proxy__/g' `find ./ -name values.yaml`
-sed -i 's/nexus3.onap.org:10001/__docker_proxy__/g' onap/values.yaml
-sed -i 's/#repository:/repository:/g' onap/values.yaml
-sed -i 's/#repositorySecret:/repositorySecret:/g' onap/values.yaml
-git diff
-
-
-# Clone integration:
-cd ~
-git clone -b master http://gerrit.onap.org/r/integration
-cd integration
-git log -1
-
-cd ~
-ln -s ~/integration/deployment/heat/onap-oom/env/__lab_name__/integration-override.yaml
-sed -i 's/nexus3.onap.org:10001/__docker_proxy__/g' integration-override.yaml
-
-
# Run ONAP:
cd ~/oom/kubernetes/
-# verify version
-helm version
helm init --client-only
helm init --upgrade
helm serve &
@@ -195,11 +186,7 @@ helm repo add local http://127.0.0.1:8879
helm repo list
make all
helm search -l | grep local
-if [ -e ~/integration-override.yaml ]; then
- helm install local/onap -n dev --namespace onap -f ~/integration-override.yaml
-else
- helm install local/onap -n dev --namespace onap
-fi
+helm install local/onap -n dev --namespace onap -f ~/integration-override.yaml
# Check ONAP status:
diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh
index c4d9bf887..a28368212 100755
--- a/deployment/heat/onap-oom/scripts/deploy.sh
+++ b/deployment/heat/onap-oom/scripts/deploy.sh
@@ -12,6 +12,9 @@ ENV_FILE=$1
source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh
+SO_ENCRYPTION_KEY=aa3871669d893c7fb8abbcda31b88b4f
+export OS_PASSWORD_ENCRYPTED=$(echo -n "$OS_PASSWORD" | openssl aes-128-ecb -e -K "$SO_ENCRYPTION_KEY" -nosalt | xxd -c 256 -p)
+
for n in $(seq 1 5); do
$WORKSPACE/test/ete/scripts/teardown-onap.sh
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 a63365837..922c7ccb6 100755
--- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
+++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
@@ -7,6 +7,12 @@ if [ -z "$WORKSPACE" ]; then
fi
PARTS_DIR=$WORKSPACE/deployment/heat/onap-oom/parts
+cat <<EOF
+#
+# Generated by scripts/gen-onap-oom-yaml.sh; MANUAL CHANGES WILL BE LOST
+#
+EOF
+
cat $PARTS_DIR/onap-oom-1.yaml
cat <<EOF
@@ -25,10 +31,12 @@ cat <<EOF
template:
get_file: rancher_vm_entrypoint.sh
params:
- __lab_name__: { get_param: lab_name }
__docker_proxy__: { get_param: docker_proxy }
__apt_proxy__: { get_param: apt_proxy }
__rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
+ __integration_override_yaml__: { get_param: integration_override_yaml }
+ __oam_network_id__: { get_resource: oam_network }
+ __oam_subnet_id__: { get_resource: oam_subnet }
__k8s_vm_ips__: [
EOF