aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/heat
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2019-04-24 09:22:14 -0700
committerGary Wu <gary.i.wu@huawei.com>2019-04-24 09:22:14 -0700
commitc76dadc92ea1a0f736e5a0f3f7090ec65589764c (patch)
tree5259309d5d1f38fcf9464e756900de0c0e02bde0 /deployment/heat
parentaee7302af295413f3cf34834dcd9c74f6aa2a1a3 (diff)
Bump helm/kubectl versions to match OOM
Bump helm to 2.12.5 and kubectl to 1.13.5. Change-Id: I5f6fe2b814dc55bf42e6807c2e6f17ae6319f064 Issue-ID: OOM-1598 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'deployment/heat')
-rw-r--r--deployment/heat/onap-rke/env/windriver/onap-oom-light.env89
-rw-r--r--deployment/heat/onap-rke/onap-oom.yaml12
-rw-r--r--deployment/heat/onap-rke/parts/onap-oom-1.yaml12
-rw-r--r--deployment/heat/onap-rke/rancher_vm_entrypoint.sh2
4 files changed, 4 insertions, 111 deletions
diff --git a/deployment/heat/onap-rke/env/windriver/onap-oom-light.env b/deployment/heat/onap-rke/env/windriver/onap-oom-light.env
deleted file mode 100644
index dd9cd5715..000000000
--- a/deployment/heat/onap-rke/env/windriver/onap-oom-light.env
+++ /dev/null
@@ -1,89 +0,0 @@
-parameters:
-
- ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-
- apt_proxy: 10.12.5.2:8000
- docker_proxy: 10.12.5.2:5000
-
- rancher_vm_flavor: m1.large
- # use a smaller image for k8 hosts
- 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: __docker_proxy__
- pullPolicy: IfNotPresent
- robot:
- enabled: true
- openStackKeyStoneUrl: "http://10.12.25.2:5000"
- openStackPublicNetId: "__public_net_id__"
- 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: "__oam_network_cidr__"
- openStackOamNetworkCidrPrefix: "10.0"
- dcaeCollectorIp: "__k8s_01_vm_ip__"
- vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
- demoArtifactsVersion: "1.2.2"
- scriptVersion: "1.2.1"
- rancherIpAddress: "__rancher_ip_addr__"
- config:
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- so:
- enabled: true
- so-catalog-db-adapter:
- config:
- openStackUserName: "${OS_USERNAME}"
- openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0"
- openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
- appc:
- enabled: true
- replicaCount: 1
- config:
- enableClustering: false
- sdnc:
- enabled: true
- replicaCount: 1
- config:
- enableClustering: false
- clamp:
- enabled: false
- pomba:
- enabled: false
- cli:
- enabled: false
- consul:
- enabled: false
- dcaegen2:
- enabled: false
- esr:
- enabled: false
- log:
- enabled: false
- mock:
- enabled: false
- mariadb-galera:
- enabled: true
- msb:
- enabled: false
- multicloud:
- enabled: false
- nbi:
- enabled: false
- oof:
- enabled: false
- policy:
- enabled: false
- uui:
- enabled: false
- vfc:
- enabled: false
- vnfsdk:
- enabled: false
diff --git a/deployment/heat/onap-rke/onap-oom.yaml b/deployment/heat/onap-rke/onap-oom.yaml
index af26bfe37..55b39beeb 100644
--- a/deployment/heat/onap-rke/onap-oom.yaml
+++ b/deployment/heat/onap-rke/onap-oom.yaml
@@ -71,21 +71,13 @@ parameters:
type: string
default: "18.09.5"
- rancher_version:
- type: string
- default: "1.6.26"
-
- rancher_agent_version:
- type: string
- default: "1.2.11"
-
kubectl_version:
type: string
- default: "1.13.4"
+ default: "1.13.5"
helm_version:
type: string
- default: "2.9.1"
+ default: "2.12.5"
helm_deploy_delay:
type: string
diff --git a/deployment/heat/onap-rke/parts/onap-oom-1.yaml b/deployment/heat/onap-rke/parts/onap-oom-1.yaml
index 465485967..886e1be6a 100644
--- a/deployment/heat/onap-rke/parts/onap-oom-1.yaml
+++ b/deployment/heat/onap-rke/parts/onap-oom-1.yaml
@@ -68,21 +68,13 @@ parameters:
type: string
default: "18.09.5"
- rancher_version:
- type: string
- default: "1.6.26"
-
- rancher_agent_version:
- type: string
- default: "1.2.11"
-
kubectl_version:
type: string
- default: "1.13.4"
+ default: "1.13.5"
helm_version:
type: string
- default: "2.9.1"
+ default: "2.12.5"
helm_deploy_delay:
type: string
diff --git a/deployment/heat/onap-rke/rancher_vm_entrypoint.sh b/deployment/heat/onap-rke/rancher_vm_entrypoint.sh
index 42a8fe055..3314a073f 100644
--- a/deployment/heat/onap-rke/rancher_vm_entrypoint.sh
+++ b/deployment/heat/onap-rke/rancher_vm_entrypoint.sh
@@ -35,8 +35,6 @@ echo "__oom_gerrit_refspec__" > /opt/config/oom_gerrit_refspec.txt
echo "__docker_manifest__" > /opt/config/docker_manifest.txt
echo "__docker_proxy__" > /opt/config/docker_proxy.txt
echo "__docker_version__" > /opt/config/docker_version.txt
-echo "__rancher_version__" > /opt/config/rancher_version.txt
-echo "__rancher_agent_version__" > /opt/config/rancher_agent_version.txt
echo "__kubectl_version__" > /opt/config/kubectl_version.txt
echo "__helm_version__" > /opt/config/helm_version.txt
echo "__helm_deploy_delay__" > /opt/config/helm_deploy_delay.txt