diff options
Diffstat (limited to 'deployment/heat/onap-rke')
| -rw-r--r-- | deployment/heat/onap-rke/env/windriver/onap-oom.env | 1 | ||||
| -rw-r--r-- | deployment/heat/onap-rke/onap-oom.yaml | 40 | ||||
| -rw-r--r-- | deployment/heat/onap-rke/parts/onap-oom-1.yaml | 40 | ||||
| -rwxr-xr-x | deployment/heat/onap-rke/scripts/deploy.sh | 10 |
4 files changed, 70 insertions, 21 deletions
diff --git a/deployment/heat/onap-rke/env/windriver/onap-oom.env b/deployment/heat/onap-rke/env/windriver/onap-oom.env index 53f1ae106..1c96592e2 100644 --- a/deployment/heat/onap-rke/env/windriver/onap-oom.env +++ b/deployment/heat/onap-rke/env/windriver/onap-oom.env @@ -13,6 +13,7 @@ parameters: public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4 oam_network_cidr: 10.0.0.0/16 + oam_ext_network_cidr: 10.100.0.0/16 integration_gerrit_branch: master diff --git a/deployment/heat/onap-rke/onap-oom.yaml b/deployment/heat/onap-rke/onap-oom.yaml index cb120d8eb..f4b21ec67 100644 --- a/deployment/heat/onap-rke/onap-oom.yaml +++ b/deployment/heat/onap-rke/onap-oom.yaml @@ -19,6 +19,10 @@ parameters: type: string description: CIDR of the OAM ONAP network + oam_ext_network_cidr: + type: string + description: CIDR of the onap_oam_ext network + ubuntu_1804_image: type: string description: Name of the Ubuntu 18.04 image @@ -77,7 +81,7 @@ parameters: helm_version: type: string - default: "2.12.5" + default: "2.12.3" helm_deploy_delay: type: string @@ -134,6 +138,13 @@ resources: - protocol: 53 - protocol: 132 + router: + type: OS::Neutron::Router + properties: + name: + list_join: ['-', [{ get_param: 'OS::stack_name' }, 'router']] + external_gateway_info: + network: { get_param: public_net_id } # ONAP management private network oam_network: @@ -157,19 +168,30 @@ resources: cidr: { get_param: oam_network_cidr } dns_nameservers: [ "8.8.8.8" ] - router: - type: OS::Neutron::Router + oam_router_interface: + type: OS::Neutron::RouterInterface properties: - name: - list_join: ['-', [{ get_param: 'OS::stack_name' }, 'router']] - external_gateway_info: - network: { get_param: public_net_id } + router_id: { get_resource: router } + subnet_id: { get_resource: oam_subnet } - router_interface: + oam_ext_network: + type: OS::Neutron::Net + properties: + name: onap_oam_ext + + oam_ext_subnet: + type: OS::Neutron::Subnet + properties: + name: onap_oam_ext + network_id: { get_resource: oam_ext_network } + cidr: { get_param: oam_ext_network_cidr } + dns_nameservers: [ "8.8.8.8" ] + + oam_ext_router_interface: type: OS::Neutron::RouterInterface properties: router_id: { get_resource: router } - subnet_id: { get_resource: oam_subnet } + subnet_id: { get_resource: oam_ext_subnet } rancher_private_port: type: OS::Neutron::Port diff --git a/deployment/heat/onap-rke/parts/onap-oom-1.yaml b/deployment/heat/onap-rke/parts/onap-oom-1.yaml index 886e1be6a..e9342a436 100644 --- a/deployment/heat/onap-rke/parts/onap-oom-1.yaml +++ b/deployment/heat/onap-rke/parts/onap-oom-1.yaml @@ -16,6 +16,10 @@ parameters: type: string description: CIDR of the OAM ONAP network + oam_ext_network_cidr: + type: string + description: CIDR of the onap_oam_ext network + ubuntu_1804_image: type: string description: Name of the Ubuntu 18.04 image @@ -74,7 +78,7 @@ parameters: helm_version: type: string - default: "2.12.5" + default: "2.12.3" helm_deploy_delay: type: string @@ -131,6 +135,13 @@ resources: - protocol: 53 - protocol: 132 + router: + type: OS::Neutron::Router + properties: + name: + list_join: ['-', [{ get_param: 'OS::stack_name' }, 'router']] + external_gateway_info: + network: { get_param: public_net_id } # ONAP management private network oam_network: @@ -154,19 +165,30 @@ resources: cidr: { get_param: oam_network_cidr } dns_nameservers: [ "8.8.8.8" ] - router: - type: OS::Neutron::Router + oam_router_interface: + type: OS::Neutron::RouterInterface properties: - name: - list_join: ['-', [{ get_param: 'OS::stack_name' }, 'router']] - external_gateway_info: - network: { get_param: public_net_id } + router_id: { get_resource: router } + subnet_id: { get_resource: oam_subnet } - router_interface: + oam_ext_network: + type: OS::Neutron::Net + properties: + name: onap_oam_ext + + oam_ext_subnet: + type: OS::Neutron::Subnet + properties: + name: onap_oam_ext + network_id: { get_resource: oam_ext_network } + cidr: { get_param: oam_ext_network_cidr } + dns_nameservers: [ "8.8.8.8" ] + + oam_ext_router_interface: type: OS::Neutron::RouterInterface properties: router_id: { get_resource: router } - subnet_id: { get_resource: oam_subnet } + subnet_id: { get_resource: oam_ext_subnet } rancher_private_port: type: OS::Neutron::Port diff --git a/deployment/heat/onap-rke/scripts/deploy.sh b/deployment/heat/onap-rke/scripts/deploy.sh index 298e3e706..7e8bdf76f 100755 --- a/deployment/heat/onap-rke/scripts/deploy.sh +++ b/deployment/heat/onap-rke/scripts/deploy.sh @@ -241,7 +241,7 @@ ssh_agent_auth: false authorization: mode: rbac ignore_docker_version: false -kubernetes_version: "v1.13.4-rancher1-2" +kubernetes_version: "v1.13.5-rancher1-2" private_registries: - url: $DOCKER_PROXY is_default: true @@ -256,10 +256,14 @@ mkdir -p ./target cp ./cluster.yml~ ./target/cluster.yml pushd ./target +wget https://github.com/rancher/rke/releases/download/v0.2.1/rke_linux-amd64 +mv rke_linux-amd64 rke +chmod +x rke + # spin up k8s with RKE -until rke up; do +until ./rke up; do sleep 1m - rke remove + ./rke remove done scp ./kube_config_cluster.yml root@$RANCHER_IP:/root/.kube/config |