diff options
Diffstat (limited to 'deployment/heat/onap-oom/onap-oom.yaml')
| -rw-r--r-- | deployment/heat/onap-oom/onap-oom.yaml | 50 |
1 files changed, 45 insertions, 5 deletions
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index 867f242d9..5c99bdb75 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -35,22 +35,50 @@ parameters: type: string description: Content for integration_override.yaml - gerrit_branch: + integration_gerrit_branch: type: string default: "master" - gerrit_refspec: + integration_gerrit_refspec: + type: string + default: "refs/heads/master" + + oom_gerrit_branch: + type: string + default: "master" + + oom_gerrit_refspec: type: string default: "refs/heads/master" docker_manifest: type: string - default: "docker-manifest.csv" + default: "" key_name: type: string default: "onap_key" + docker_version: + type: string + default: "17.03" + + rancher_version: + type: string + default: "1.6.18" + + rancher_agent_version: + type: string + default: "1.2.10" + + kubectl_version: + type: string + default: "1.8.10" + + helm_version: + type: string + default: "2.9.1" + resources: random-str: type: OS::Heat::RandomString @@ -153,9 +181,16 @@ resources: __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } __integration_override_yaml__: { get_param: integration_override_yaml } - __gerrit_branch__: { get_param: gerrit_branch } - __gerrit_refspec__: { get_param: gerrit_refspec } + __integration_gerrit_branch__: { get_param: integration_gerrit_branch } + __integration_gerrit_refspec__: { get_param: integration_gerrit_refspec } + __oom_gerrit_branch__: { get_param: oom_gerrit_branch } + __oom_gerrit_refspec__: { get_param: oom_gerrit_refspec } __docker_manifest__: { get_param: docker_manifest } + __docker_version__: { get_param: docker_version } + __rancher_version__: { get_param: rancher_version } + __rancher_agent_version__: { get_param: rancher_agent_version } + __kubectl_version__: { get_param: kubectl_version } + __helm_version__: { get_param: helm_version } __public_net_id__: { get_param: public_net_id } __oam_network_cidr__: { get_param: oam_network_cidr } __oam_network_id__: { get_resource: oam_network } @@ -204,6 +239,7 @@ resources: params: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } template: @@ -238,6 +274,7 @@ resources: params: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } template: @@ -272,6 +309,7 @@ resources: params: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } template: @@ -306,6 +344,7 @@ resources: params: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } template: @@ -340,6 +379,7 @@ resources: params: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } template: |