diff options
Diffstat (limited to 'TOSCA')
-rw-r--r-- | TOSCA/Helm/helmdelete.sh | 4 | ||||
-rw-r--r-- | TOSCA/Helm/helminstall.sh | 11 | ||||
-rw-r--r-- | TOSCA/Helm/k8s_delete_env.sh | 24 | ||||
-rw-r--r-- | TOSCA/Helm/k8s_setup_env.sh | 25 | ||||
-rw-r--r-- | TOSCA/Helm/onap-blueprint.yaml | 162 | ||||
-rw-r--r-- | TOSCA/VM/MessageRouter/MessageRouter.yaml | 17 | ||||
-rw-r--r-- | TOSCA/VM/MessageRouter/scripts/messagerouter.sh | 17 | ||||
-rw-r--r-- | TOSCA/VM/appc/appc.yaml | 17 | ||||
-rw-r--r-- | TOSCA/VM/appc/scripts/appc.sh | 17 | ||||
-rw-r--r-- | TOSCA/VM/policy/Policy.yaml | 17 | ||||
-rw-r--r-- | TOSCA/VM/policy/scripts/policy.sh | 17 | ||||
-rw-r--r-- | TOSCA/VM/so/scripts/so.sh | 17 | ||||
-rw-r--r-- | TOSCA/VM/so/so.yaml | 17 | ||||
-rw-r--r-- | TOSCA/kubernetes-cluster-TOSCA/imports/cloud-config.yaml | 25 | ||||
-rw-r--r-- | TOSCA/kubernetes-cluster-TOSCA/openstack-blueprint.yaml | 2 |
15 files changed, 325 insertions, 64 deletions
diff --git a/TOSCA/Helm/helmdelete.sh b/TOSCA/Helm/helmdelete.sh index e098fbbc13..201471ba73 100644 --- a/TOSCA/Helm/helmdelete.sh +++ b/TOSCA/Helm/helmdelete.sh @@ -16,8 +16,6 @@ # limitations under the License. #============LICENSE_END============================================ -helm delete $1-$2 --purge -kubectl delete namespace $1-$2 -kubectl delete clusterrolebinding $1-$2-admin-binding +helm delete $2 --purge diff --git a/TOSCA/Helm/helminstall.sh b/TOSCA/Helm/helminstall.sh index a6e09c8959..f108825621 100644 --- a/TOSCA/Helm/helminstall.sh +++ b/TOSCA/Helm/helminstall.sh @@ -19,12 +19,5 @@ printf "%s" "$*" printf `pwd` printf "%s" "---------------" -kubectl create namespace $1-$2 -kubectl create clusterrolebinding $1-$2-admin-binding --clusterrole=cluster-admin --serviceaccount=$1-$2:default -# assign default auth token -if [[ -z $ONAP_DEFAULT_AUTH_TOKEN ]]; then - DEFAULT_SECRET=`kubectl get secrets -n $1-$2 | grep default-token | awk '{ print $1}'` - ONAP_DEFAULT_AUTH_TOKEN=`kubectl get secrets $DEFAULT_SECRET -n $1-$2 -o yaml | grep 'token:' | awk '{ print $2}' | base64 -d` -fi -kubectl --namespace $1-$2 create secret docker-registry $1-docker-registry-key --docker-server=nexus3.onap.org:10001 --docker-username=docker --docker-password=docker --docker-email=@ -helm install ../$2/ --name $1-$2 --namespace $1 --set nsPrefix=$1,nodePortPrefix=302,kubeMasterAuthToken=$ONAP_DEFAULT_AUTH_TOKEN
\ No newline at end of file + +helm install local/$2 --name $2 --namespace $1
\ No newline at end of file diff --git a/TOSCA/Helm/k8s_delete_env.sh b/TOSCA/Helm/k8s_delete_env.sh new file mode 100644 index 0000000000..c715e22660 --- /dev/null +++ b/TOSCA/Helm/k8s_delete_env.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# ============LICENSE_START========================================== +# =================================================================== +# Copyright (c) 2017 AT&T +# +# 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. +#============LICENSE_END============================================ + +kubectl delete secret $1-docker-registry-key +kubectl delete clusterrolebinding $1-admin-binding +kubectl delete namespace $1 + + + diff --git a/TOSCA/Helm/k8s_setup_env.sh b/TOSCA/Helm/k8s_setup_env.sh new file mode 100644 index 0000000000..1e226f2ae0 --- /dev/null +++ b/TOSCA/Helm/k8s_setup_env.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# ============LICENSE_START========================================== +# =================================================================== +# Copyright (c) 2017 AT&T +# +# 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. +#============LICENSE_END============================================ + +printf "%s" "$*" +printf `pwd` +printf "%s" "---------------" + +kubectl create namespace $1 +kubectl create clusterrolebinding $1-admin-binding --clusterrole=cluster-admin --serviceaccount=$1:default +kubectl --namespace $1 create secret docker-registry $1-docker-registry-key --docker-server=nexus3.onap.org:10001 --docker-username=docker --docker-password=docker --docker-email=@
\ No newline at end of file diff --git a/TOSCA/Helm/onap-blueprint.yaml b/TOSCA/Helm/onap-blueprint.yaml index f86b590eda..3ac76fa8b1 100644 --- a/TOSCA/Helm/onap-blueprint.yaml +++ b/TOSCA/Helm/onap-blueprint.yaml @@ -28,7 +28,7 @@ inputs: ip: user: default: centos - namespace_perfix: + namespace: default: onap node_types: @@ -36,7 +36,7 @@ node_types: derived_from: cloudify.nodes.SoftwareComponent properties: cwd: - default: /home/centos/oom/kubernetes/oneclick + default: /home/centos/oom/kubernetes args: default: - onap @@ -79,203 +79,271 @@ node_templates: key: { get_secret: agent_key_private } user: { get_input: user } + k8s_env: + type: cloudify.nodes.SoftwareComponent + properties: + interfaces: + cloudify.interfaces.lifecycle: + start: + implementation: fabric.fabric_plugin.tasks.run_script + inputs: + script_path: k8s_setup_env.sh + process: + args: [{ get_input: namespace }] + fabric_env: + host_string: { get_input: ip } + user: { get_input: user } + key: { get_secret: agent_key_private } + stop: + implementation: fabric.fabric_plugin.tasks.run_script + inputs: + script_path: k8s_delete_env.sh + process: + args: [{ get_input: namespace }] + fabric_env: + host_string: { get_input: ip } + user: { get_input: user } + key: { get_secret: agent_key_private } + relationships: + - type: cloudify.relationships.connected_to + target: k8s_master + consul: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } + - { get_input: namespace } - consul relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env msb: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } + - { get_input: namespace } - msb relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env - - mso: + so: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } - - mso + - { get_input: namespace } + - so relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env appc: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } + - { get_input: namespace } - appc relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env - message-router: + dmaap: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } - - message-router + - { get_input: namespace } + - dmaap relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env + + oof: + type: cloudify.nodes.Helm + properties: + args: + - { get_input: namespace } + - oof + relationships: + - type: cloudify.relationships.connected_to + target: k8s_env sdnc: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } + - { get_input: namespace } - sdnc relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env vid: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } + - { get_input: namespace } - vid relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env robot: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } + - { get_input: namespace } - robot relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env policy: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } + - { get_input: namespace } - policy relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env portal: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } + - { get_input: namespace } - portal relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env aai: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } + - { get_input: namespace } - aai relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env sdc: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } + - { get_input: namespace } - sdc relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env log: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } + - { get_input: namespace } - log relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env cli: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } + - { get_input: namespace } - cli relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env multicloud: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } + - { get_input: namespace } - multicloud relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env clamp: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } + - { get_input: namespace } - clamp relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env vnfsdk: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } + - { get_input: namespace } - vnfsdk relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env uui: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } + - { get_input: namespace } - uui relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env aaf: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } + - { get_input: namespace } - aaf relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env vfc: type: cloudify.nodes.Helm properties: args: - - { get_input: namespace_perfix } + - { get_input: namespace } - vfc relationships: - type: cloudify.relationships.connected_to - target: k8s_master + target: k8s_env + + dcaegen2: + type: cloudify.nodes.Helm + properties: + args: + - { get_input: namespace } + - dcaegen2 + relationships: + - type: cloudify.relationships.connected_to + target: k8s_env + + esr: + type: cloudify.nodes.Helm + properties: + args: + - { get_input: namespace } + - esr + relationships: + - type: cloudify.relationships.connected_to + target: k8s_env + + sniro-emulator: + type: cloudify.nodes.Helm + properties: + args: + - { get_input: namespace } + - sniro-emulator + relationships: + - type: cloudify.relationships.connected_to + target: k8s_env diff --git a/TOSCA/VM/MessageRouter/MessageRouter.yaml b/TOSCA/VM/MessageRouter/MessageRouter.yaml index 98e8b93fe2..4ae5b52167 100644 --- a/TOSCA/VM/MessageRouter/MessageRouter.yaml +++ b/TOSCA/VM/MessageRouter/MessageRouter.yaml @@ -1,3 +1,20 @@ +# ============LICENSE_START========================================== +# =================================================================== +# Copyright (c) 2017 AT&T +# +# 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. +#============LICENSE_END============================================ + ########################################################### # This Blueprint installs ONAP Message Router on Openstack ########################################################### diff --git a/TOSCA/VM/MessageRouter/scripts/messagerouter.sh b/TOSCA/VM/MessageRouter/scripts/messagerouter.sh index eb4bf2b81e..081cb0bebd 100644 --- a/TOSCA/VM/MessageRouter/scripts/messagerouter.sh +++ b/TOSCA/VM/MessageRouter/scripts/messagerouter.sh @@ -1,5 +1,22 @@ #!/bin/sh +# ============LICENSE_START========================================== +# =================================================================== +# Copyright (c) 2017 AT&T +# +# 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. +#============LICENSE_END============================================ + # PUBIP="$1" PVTIP="$2" diff --git a/TOSCA/VM/appc/appc.yaml b/TOSCA/VM/appc/appc.yaml index ddc78f81d4..5a4cff7f30 100644 --- a/TOSCA/VM/appc/appc.yaml +++ b/TOSCA/VM/appc/appc.yaml @@ -1,3 +1,20 @@ +# ============LICENSE_START========================================== +# =================================================================== +# Copyright (c) 2017 AT&T +# +# 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. +#============LICENSE_END============================================ + ########################################################### # This Blueprint installs ONAP appc on Openstack ########################################################### diff --git a/TOSCA/VM/appc/scripts/appc.sh b/TOSCA/VM/appc/scripts/appc.sh index e89f1b0d85..1ceebae12b 100644 --- a/TOSCA/VM/appc/scripts/appc.sh +++ b/TOSCA/VM/appc/scripts/appc.sh @@ -1,5 +1,22 @@ #!/bin/sh +# ============LICENSE_START========================================== +# =================================================================== +# Copyright (c) 2017 AT&T +# +# 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. +#============LICENSE_END============================================ + # PUBIP="$1" PVTIP="$2" diff --git a/TOSCA/VM/policy/Policy.yaml b/TOSCA/VM/policy/Policy.yaml index 5fd13fcf1b..76ff563084 100644 --- a/TOSCA/VM/policy/Policy.yaml +++ b/TOSCA/VM/policy/Policy.yaml @@ -1,3 +1,20 @@ +# ============LICENSE_START========================================== +# =================================================================== +# Copyright (c) 2017 AT&T +# +# 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. +#============LICENSE_END============================================ + ########################################################### # This Blueprint installs ONAP policy on Openstack ########################################################### diff --git a/TOSCA/VM/policy/scripts/policy.sh b/TOSCA/VM/policy/scripts/policy.sh index 66cedd9b3a..f01420cbdf 100644 --- a/TOSCA/VM/policy/scripts/policy.sh +++ b/TOSCA/VM/policy/scripts/policy.sh @@ -1,5 +1,22 @@ #!/bin/sh +# ============LICENSE_START========================================== +# =================================================================== +# Copyright (c) 2017 AT&T +# +# 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. +#============LICENSE_END============================================ + # PUBIP="$1" PVTIP="$2" diff --git a/TOSCA/VM/so/scripts/so.sh b/TOSCA/VM/so/scripts/so.sh index e570a9ddb9..ade760f507 100644 --- a/TOSCA/VM/so/scripts/so.sh +++ b/TOSCA/VM/so/scripts/so.sh @@ -1,5 +1,22 @@ #!/bin/sh +# ============LICENSE_START========================================== +# =================================================================== +# Copyright (c) 2017 AT&T +# +# 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. +#============LICENSE_END============================================ + # PUBIP="$1" PVTIP="$2" diff --git a/TOSCA/VM/so/so.yaml b/TOSCA/VM/so/so.yaml index 4381a6eb48..e4719dff02 100644 --- a/TOSCA/VM/so/so.yaml +++ b/TOSCA/VM/so/so.yaml @@ -1,3 +1,20 @@ +# ============LICENSE_START========================================== +# =================================================================== +# Copyright (c) 2017 AT&T +# +# 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. +#============LICENSE_END============================================ + ########################################################### # This Blueprint installs ONAP SO on Openstack ########################################################### diff --git a/TOSCA/kubernetes-cluster-TOSCA/imports/cloud-config.yaml b/TOSCA/kubernetes-cluster-TOSCA/imports/cloud-config.yaml index 2a7b7e7bc4..e0aba3d961 100644 --- a/TOSCA/kubernetes-cluster-TOSCA/imports/cloud-config.yaml +++ b/TOSCA/kubernetes-cluster-TOSCA/imports/cloud-config.yaml @@ -34,6 +34,17 @@ node_templates: ssh-authorized-keys: - { get_secret: agent_key_public } write_files: + - path: /etc/yum.repos.d/docker.repo + owner: root:root + permissions: '0444' + content: | + # installed by cloud-init + [dockerrepo] + name=Docker Repository + baseurl=https://yum.dockerproject.org/repo/main/centos/7 + enabled=1 + gpgcheck=1 + gpgkey=https://yum.dockerproject.org/gpg - path: /etc/yum.repos.d/kubernetes.repo owner: root:root permissions: '0444' @@ -57,10 +68,10 @@ node_templates: net.bridge.bridge-nf-call-iptables = 1 packages: - - [docker, 1.12.6] - - [kubelet, 1.8.6-0] - - [kubeadm, 1.8.6-0] - - [kubectl, 1.8.6-0] + - [docker-engine, 17.03.0.ce-1.el7.centos] + - [kubelet, 1.8.10-0] + - [kubeadm, 1.8.10-0] + - [kubectl, 1.8.10-0] - [kubernetes-cni, 0.5.1-1] - [nfs-utils] - git @@ -68,10 +79,16 @@ node_templates: runcmd: - [ setenforce, 0 ] - [ sysctl , '--system' ] + - [ update-ca-trust, force-enable ] + - "sed -i 's|/usr/bin/dockerd|/usr/bin/dockerd --exec-opt native.cgroupdriver=systemd|g' /usr/lib/systemd/system/docker.service" - [ systemctl, enable, docker ] - [ systemctl, start, docker ] + - [ chmod, 655, /etc/systemd/system/kubelet.service ] + - [ chmod, 655, /etc/systemd/system/kubelet.service.d/10-kubeadm.conf ] - [ systemctl, enable, kubelet ] - [ systemctl, start, kubelet ] + - [ iptables, --flush ] + - [ iptables, -tnat, --flush ] - [ mkdir, '-p', /tmp/data ] - [ chcon, '-Rt', svirt_sandbox_file_t, /tmp/data ] - [ mkdir, '-p', /dockerdata-nfs ] diff --git a/TOSCA/kubernetes-cluster-TOSCA/openstack-blueprint.yaml b/TOSCA/kubernetes-cluster-TOSCA/openstack-blueprint.yaml index 3219791c0d..8f5716fead 100644 --- a/TOSCA/kubernetes-cluster-TOSCA/openstack-blueprint.yaml +++ b/TOSCA/kubernetes-cluster-TOSCA/openstack-blueprint.yaml @@ -47,7 +47,7 @@ inputs: helm_version: description: helm version to be installed - default: v2.7.0 + default: v2.8.2 dsl_definitions: |