diff options
Diffstat (limited to 'deployment')
9 files changed, 53 insertions, 9 deletions
diff --git a/deployment/Azure_ARM_Template/arm_cluster_deploy_beijing.json b/deployment/Azure_ARM_Template/arm_cluster_deploy_beijing.json index 79dda59e8..ed4dc10c2 100644 --- a/deployment/Azure_ARM_Template/arm_cluster_deploy_beijing.json +++ b/deployment/Azure_ARM_Template/arm_cluster_deploy_beijing.json @@ -390,7 +390,7 @@ "typeHandlerVersion": "2.0", "autoUpgradeMinorVersion": true, "settings": { - "fileUris": [ "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=Azure_ARM_Template/scripts/azure-rancher-server.sh;hb=refs/heads/master" ], + "fileUris": [ "https://git.onap.org/integration/plain/deployment/Azure_ARM_Template/scripts/azure-rancher-server.sh" ], "commandToExecute": "[concat('./' , parameters('masterScriptName'),' ',reference(variables('publicIPAddressName')).dnsSettings.fqdn,' ',parameters('privateIPAddress'),' ',parameters('numberOfVms'))]" } } @@ -413,7 +413,7 @@ "typeHandlerVersion": "2.0", "autoUpgradeMinorVersion": true, "settings": { - "fileUris": [ "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=Azure_ARM_Template/scripts/azure-k8s-node.sh;hb=refs/heads/master" ], + "fileUris": [ "https://git.onap.org/integration/plain/deployment/Azure_ARM_Template/scripts/azure-k8s-node.sh" ], "commandToExecute": "[concat('./' , parameters('nodeScriptName'),' ',concat(parameters('privateIPAddress'),'0'))]" } } diff --git a/deployment/Azure_ARM_Template/scripts/azure-rancher-server.sh b/deployment/Azure_ARM_Template/scripts/azure-rancher-server.sh index 1c4373c4d..fc92c295e 100644 --- a/deployment/Azure_ARM_Template/scripts/azure-rancher-server.sh +++ b/deployment/Azure_ARM_Template/scripts/azure-rancher-server.sh @@ -3,7 +3,7 @@ set -x DOCKER_VERSION=17.03 -RANCHER_VERSION=1.6.14 +RANCHER_VERSION=1.6.18 KUBECTL_VERSION=1.8.10 HELM_VERSION=2.9.1 diff --git a/deployment/heat/onap-oom/env/gwu/onap-oom.env b/deployment/heat/onap-oom/env/gwu/onap-oom.env index cca6c0fbf..dacb243b2 100644 --- a/deployment/heat/onap-oom/env/gwu/onap-oom.env +++ b/deployment/heat/onap-oom/env/gwu/onap-oom.env @@ -20,7 +20,7 @@ parameters: robot: openStackKeyStoneUrl: "http://192.168.1.11:5000" openStackPublicNetId: "__public_net_id__" - openStackPassword: "${OS_PASSWORD}" + openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" openStackTenantId: "${OS_PROJECT_ID}" openStackUserName: "${OS_USERNAME}" ubuntu14Image: "trusty" diff --git a/deployment/heat/onap-oom/env/huawei/onap-oom.env b/deployment/heat/onap-oom/env/huawei/onap-oom.env index 96cf46974..4991ab933 100644 --- a/deployment/heat/onap-oom/env/huawei/onap-oom.env +++ b/deployment/heat/onap-oom/env/huawei/onap-oom.env @@ -20,7 +20,7 @@ parameters: robot: openStackKeyStoneUrl: "http://10.145.122.118:5000" openStackPublicNetId: "__public_net_id__" - openStackPassword: "${OS_PASSWORD}" + openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" openStackTenantId: "${OS_PROJECT_ID}" openStackUserName: "${OS_USERNAME}" ubuntu14Image: "trusty" diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env index fa7cab767..ec3399bc4 100644 --- a/deployment/heat/onap-oom/env/tlab/onap-oom.env +++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env @@ -19,7 +19,7 @@ parameters: robot: openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000" openStackPublicNetId: "__oam_network_id__" # NOTE: for TLAB, openStackPublicNetId needs to be oam_network_id instead of public_net_id - openStackPassword: "${OS_PASSWORD}" + openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" openStackTenantId: "${OS_PROJECT_ID}" openStackUserName: "${OS_USERNAME}" ubuntu14Image: "Ubuntu 14.04 LTS Generic" diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom-light.env b/deployment/heat/onap-oom/env/windriver/onap-oom-light.env index c37cf757c..75c4f054c 100644 --- a/deployment/heat/onap-oom/env/windriver/onap-oom-light.env +++ b/deployment/heat/onap-oom/env/windriver/onap-oom-light.env @@ -20,7 +20,7 @@ parameters: robot: openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackPublicNetId: "__public_net_id__" - openStackPassword: "${OS_PASSWORD}" + openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" openStackTenantId: "${OS_PROJECT_ID}" openStackUserName: "${OS_USERNAME}" ubuntu14Image: "ubuntu-14-04-cloud-amd64" diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env index c9cc2ba04..48cc977e1 100644 --- a/deployment/heat/onap-oom/env/windriver/onap-oom.env +++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env @@ -19,7 +19,7 @@ parameters: robot: openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackPublicNetId: "__public_net_id__" - openStackPassword: "${OS_PASSWORD}" + openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" openStackTenantId: "${OS_PROJECT_ID}" openStackUserName: "${OS_USERNAME}" ubuntu14Image: "ubuntu-14-04-cloud-amd64" diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index e8b0ffa7d..9b9495a33 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -205,6 +205,7 @@ resources: get_attr: [k8s_3_floating_ip, floating_ip_address], get_attr: [k8s_4_floating_ip, floating_ip_address], get_attr: [k8s_5_floating_ip, floating_ip_address], + get_attr: [k8s_6_floating_ip, floating_ip_address], ] __k8s_private_ips__: [ get_attr: [k8s_1_floating_ip, fixed_ip_address], @@ -212,6 +213,7 @@ resources: get_attr: [k8s_3_floating_ip, fixed_ip_address], get_attr: [k8s_4_floating_ip, fixed_ip_address], get_attr: [k8s_5_floating_ip, fixed_ip_address], + get_attr: [k8s_6_floating_ip, fixed_ip_address], ] k8s_1_private_port: type: OS::Neutron::Port @@ -393,6 +395,42 @@ resources: template: get_file: k8s_vm_entrypoint.sh + k8s_6_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_network } + fixed_ips: [{"subnet": { get_resource: oam_subnet }}] + security_groups: + - { get_resource: onap_sg } + + k8s_6_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: k8s_6_private_port } + + k8s_6_vm: + type: OS::Nova::Server + properties: + name: + list_join: ['-', [ { get_param: 'OS::stack_name' }, 'k8s_6']] + image: { get_param: ubuntu_1604_image } + flavor: { get_param: k8s_vm_flavor } + key_name: { get_param: key_name } + networks: + - port: { get_resource: k8s_6_private_port } + user_data_format: RAW + user_data: + str_replace: + 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: + get_file: k8s_vm_entrypoint.sh + outputs: rancher_vm_ip: description: The IP address of the rancher instance @@ -418,3 +456,7 @@ outputs: description: The IP address of the k8s_5 instance value: { get_attr: [k8s_5_floating_ip, floating_ip_address] } + k8s_6_vm_ip: + description: The IP address of the k8s_6 instance + value: { get_attr: [k8s_6_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 6066396f1..0a636e260 100644 --- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh @@ -250,8 +250,10 @@ sleep 3 helm repo add local http://127.0.0.1:8879 helm repo list make all +rsync -avt ~/oom/kubernetes/helm/plugins ~/.helm/ helm search -l | grep local -helm install local/onap -n dev --namespace onap -f ~/integration-override.yaml +helm deploy dev local/onap -f ~/integration-override.yaml --namespace onap | tee ~/helm-deploy.log +helm list # Enable auto-completion for kubectl echo "source <(kubectl completion bash)" >> ~/.bashrc |