Add cloudify folder I forgot. Fix bug in b8s deploy script.

JIRA: MODELS-23

Few more tweaks to work with current deployment approach.

Change-Id: Ib5257f63f2f4e2948ec7c93aac5c40ae7bb6c37a
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>

3 files changed, 240 insertions, 5 deletions

diff --git a/tools/cloudify/blueprints/k8s-hello-world.yaml b/tools/cloudify/blueprints/k8s-hello-world.yaml
new file mode 100644
index 0000000..bdfa80c
--- /dev/null
+++ b/tools/cloudify/blueprints/k8s-hello-world.yaml
@@ -0,0 +1,80 @@
+tosca_definitions_version: cloudify_dsl_1_3
+# Following part based upon https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/blob/master/examples/simple-blueprint-defined-resource.yaml
+
+imports:
+  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
+  - https://raw.githubusercontent.com/cloudify-incubator/cloudify-kubernetes-plugin/1.2.1/plugin.yaml
+
+inputs:
+
+  kubernetes_configuration_file_content:
+    default: kube.config
+
+  kubernetes_master_ip:
+    type: string
+    default: { get_secret: kubernetes_master_ip }
+
+  kubernetes_master_port:
+    type: string
+    default: { get_secret: kubernetes_master_port }
+
+  kubernetes_certificate_authority_data:
+    default: { get_secret: kubernetes_certificate_authority_data }
+
+  kubernetes-admin_client_certificate_data:
+    default: { get_secret: kubernetes-admin_client_certificate_data }
+
+  kubernetes-admin_client_key_data:
+    default: { get_secret: kubernetes-admin_client_key_data }
+
+  kubernetes_master_configuration:
+    default:
+      apiVersion: v1
+      kind: Config
+      preferences: {}
+      current-context: kubernetes-admin@kubernetes
+      clusters:
+      - name: kubernetes
+        cluster:
+          certificate-authority-data: { get_input: kubernetes_certificate_authority_data }
+          server: { concat: [ 'https://', { get_input: kubernetes_master_ip}, ':', { get_input: kubernetes_master_port } ] }
+      contexts:
+      - name: kubernetes-admin@kubernetes
+        context:
+          cluster: kubernetes
+          user: kubernetes-admin
+      users:
+      - name: kubernetes-admin
+        user:
+          client-certificate-data: { get_input: kubernetes-admin_client_certificate_data }
+          client-key-data:  { get_input: kubernetes-admin_client_key_data }
+
+  kubernetes_configuration_file_content:
+    description: >
+      File content of kubernetes master YAML configuration
+    default: { get_input: kubernetes_master_configuration }
+
+node_templates:
+  master:
+    type: cloudify.kubernetes.nodes.Master
+    properties:
+      configuration:
+        file_content: { get_input: kubernetes_configuration_file_content }
+
+# Following part based upon http://docs.getcloudify.org/4.1.0/plugins/kubernetes/
+  nginx_pod:
+    type: cloudify.kubernetes.resources.Pod
+    properties:
+      definition:
+        apiVersion: v1
+        metadata:
+          name: nginx
+        spec:
+          containers:
+          - name: nginx
+            image: nginx:1.7.9
+            ports:
+            - containerPort: 80
+    relationships:
+      - type: cloudify.kubernetes.relationships.managed_by_master
+        target: master
diff --git a/tools/cloudify/k8s-cloudify.sh b/tools/cloudify/k8s-cloudify.sh
new file mode 100644
index 0000000..fe85697
--- /dev/null
+++ b/tools/cloudify/k8s-cloudify.sh
@@ -0,0 +1,150 @@
+#!/bin/bash
+# Copyright 2017 AT&T Intellectual Property, Inc
+#
+# 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.
+#
+#. What this is: Setup script for Cloudify use with Kubernetes.
+#. Prerequisites: 
+#. - Kubernetes cluster installed per k8s-cluster.sh (in this repo)
+#. Usage:
+#.   From a server with access to the kubernetes master node:
+#.   $ git clone https://gerrit.opnfv.org/gerrit/models ~/models
+#.   $ scp -r ~/models/tools/cloudify ubuntu@<k8s-master>:/home/ubuntu/. 
+#.     <k8s-master>: IP or hostname of kubernetes master server
+#.   $ ssh -x ubuntu@<k8s-master> cloudify/k8s-cloudify.sh prereqs
+#.     prereqs: installs prerequisites and configures ubuntu user for kvm use
+#.   $ ssh -x ubuntu@<k8s-master> bash cloudify/k8s-cloudify.sh [setup|clean]
+#. Status: this is a work in progress, under test.
+
+function prereqs() {
+  echo "${FUNCNAME[0]}: Install prerequisites"
+  sudo apt-get install -y virtinst qemu-kvm libguestfs-tools virtualenv git python-pip
+  echo "${FUNCNAME[0]}: Setup $USER for kvm use"
+  # Per http://libguestfs.org/guestfs-faq.1.html
+  # workaround for virt-customize warning: libguestfs: warning: current user is not a member of the KVM group (group ID 121). This user cannot access /dev/kvm, so libguestfs may run very slowly. It is recommended that you 'chmod 0666 /dev/kvm' or add the current user to the KVM group (you might need to log out and log in again). 
+  # Also see: https://help.ubuntu.com/community/KVM/Installation
+  # also to avoid permission denied errors in guestfish, from http://manpages.ubuntu.com/manpages/zesty/man1/guestfs-faq.1.html
+  sudo usermod -a -G kvm $USER
+  sudo chmod 0644 /boot/vmlinuz*
+  echo "${FUNCNAME[0]}: Clone repo"
+}
+
+function setup () {
+  cd ~/cloudify
+  echo "${FUNCNAME[0]}: Setup Cloudify-CLI"
+  # Per http://docs.getcloudify.org/4.1.0/installation/bootstrapping/#installing-cloudify-manager-in-an-offline-environment
+  wget -q http://repository.cloudifysource.org/cloudify/17.9.21/community-release/cloudify-cli-community-17.9.21.deb
+  # Installs into /opt/cfy/
+  sudo dpkg -i cloudify-cli-community-17.9.21.deb
+  export MANAGER_BLUEPRINTS_DIR=/opt/cfy/cloudify-manager-blueprints
+  virtualenv ~/cloudify/env
+  source ~/cloudify/env/bin/activate
+
+  echo "${FUNCNAME[0]}: Setup Cloudify-Manager"
+  # to start over
+  # sudo virsh destroy cloudify-manager; sudo virsh undefine cloudify-manager
+  wget -q http://repository.cloudifysource.org/cloudify/17.9.21/community-release/cloudify-manager-community-17.9.21.qcow2
+  # nohup and redirection of output is a workaround for some issue with virt-install never outputting anything beyond "Creadint domain..." and thus not allowing the script to continue.
+  nohup virt-install --connect qemu:///system --virt-type kvm --name cloudify-manager --vcpus 4 --memory 16192 --disk cloudify-manager-community-17.9.21.qcow2 --import --network network=default --os-type=linux --os-variant=rhel7 > /dev/null 2>&1 &
+
+  VM_IP=""
+  n=0
+  while [[ "x$VM_IP" == "x" ]]; do
+    echo "${FUNCNAME[0]}: $n minutes so far; waiting 60 seconds for cloudify-manager IP to be assigned"
+    sleep 60
+    ((n++))
+    VM_MAC=$(virsh domiflist cloudify-manager | grep default | grep -Eo "[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+")
+    VM_IP=$(/usr/sbin/arp -e | grep ${VM_MAC} | awk {'print $1'})
+  done
+  echo "${FUNCNAME[0]}: cloudify-manager IP=$VM_IP"
+  while ! cfy profiles use $VM_IP -u admin -p admin -t default_tenant ; do
+    echo "${FUNCNAME[0]}: waiting 60 seconds for cloudify-manager API to be active"
+    sleep 60
+  done
+  cfy status
+  
+  echo "${FUNCNAME[0]}: Install Cloudify Kubernetes Plugin"
+  # Per http://docs.getcloudify.org/4.1.0/plugins/container-support/
+  # Per https://github.com/cloudify-incubator/cloudify-kubernetes-plugin
+  pip install kubernetes wagon
+  # From https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/releases
+  wget -q https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/releases/download/1.2.1/cloudify_kubernetes_plugin-1.2.1-py27-none-linux_x86_64-centos-Core.wgn
+  # For Cloudify-CLI per http://docs.getcloudify.org/4.1.0/plugins/using-plugins/
+  wagon install cloudify_kubernetes_plugin-1.2.1-py27-none-linux_x86_64-centos-Core.wgn
+  # For Cloudify-Manager per https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/blob/master/examples/persistent-volumes-blueprint.yaml
+  cfy plugins upload cloudify_kubernetes_plugin-1.2.1-py27-none-linux_x86_64-centos-Core.wgn
+
+  echo "${FUNCNAME[0]}: Create secrets for kubernetes as referenced in blueprints"  
+  cfy secrets create -s $(grep server ~/.kube/config | awk -F '/' '{print $3}' | awk -F ':' '{print $1}') kubernetes_master_ip
+  cfy secrets create -s $(grep server ~/.kube/config | awk -F '/' '{print $3}' | awk -F ':' '{print $2}') kubernetes_master_port
+  cfy secrets create -s $(grep 'certificate-authority-data: ' ~/.kube/config | awk -F ' ' '{print $2}') kubernetes_certificate_authority_data
+  cfy secrets create -s $(grep 'client-certificate-data: ' ~/.kube/config | awk -F ' ' '{print $2}') kubernetes-admin_client_certificate_data
+  cfy secrets create -s $(grep 'client-key-data: ' ~/.kube/config | awk -F ' ' '{print $2}') kubernetes-admin_client_key_data
+  cfy secrets list
+
+  echo "${FUNCNAME[0]}: Cloudify CLI config is at ~/.cloudify/config.yaml"
+  echo "${FUNCNAME[0]}: Cloudify CLI log is at ~/.cloudify/logs/cli.log"
+}
+
+function demo() {
+  # Per http://docs.getcloudify.org/4.1.0/plugins/container-support/
+  # Per https://github.com/cloudify-incubator/cloudify-kubernetes-plugin
+  # Also per guidance at https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/issues/18
+#  echo "master-ip: $(grep server ~/.kube/config | awk -F '/' '{print $3}' | awk -F ':' '{print $1}')" >~/cloudify/blueprints/k8s-hello-world/inputs.yaml
+#  echo "master-port: $(grep server ~/.kube/config | awk -F '/' '{print $3}' | awk -F ':' '{print $2}')" >>~/cloudify/blueprints/k8s-hello-world/inputs.yaml
+#  echo "file_content:" >>~/cloudify/blueprints/k8s-hello-world/inputs.yaml
+#  sed 's/^/  /' ~/.kube/config | tee -a ~/cloudify/blueprints/k8s-hello-world/inputs.yaml
+  cp ~/.kube/config ~/cloudify/blueprints/k8s-hello-world/kube.config
+
+  cfy blueprints package -o ~/cloudify/blueprints/k8s-hello-world ~/cloudify/blueprints/k8s-hello-world
+  cfy blueprints upload -t default_tenant -b k8s-hello-world ~/cloudify/blueprints/k8s-hello-world.tar.gz
+  cfy deployments create -t default_tenant -b k8s-hello-world k8s-hello-world
+  cfy workflows list -d k8s-hello-world
+  cfy executions start install -d k8s-hello-world
+  pod_ip=$(kubectl get pods --namespace default -o jsonpath='{.status.podIP}' nginx)
+  while [[ "x$pod_ip" == "x" ]]; do
+    echo "${FUNCNAME[0]}: nginx pod IP is not yet assigned, waiting 10 seconds"
+    sleep 10
+    pod_ip=$(kubectl get pods --namespace default -o jsonpath='{.status.podIP}' nginx)
+  done
+  while ! curl http://$pod_ip ; do
+    echo "${FUNCNAME[0]}: nginx pod is not yet responding at http://$pod_ip, waiting 10 seconds"
+    sleep 10
+  done
+  echo "${FUNCNAME[0]}: nginx pod is active at http://$pod_ip"
+  curl http://$pod_ip
+}
+
+function clean () {
+  echo "${FUNCNAME[0]}: Cleanup cloudify"
+  # TODO
+}
+
+dist=`grep DISTRIB_ID /etc/*-release | awk -F '=' '{print $2}'`
+case "$1" in
+  "prereqs")
+    prereqs
+    ;;
+  "setup")
+    setup
+    ;;
+  "demo")
+    demo
+    ;;
+  "clean")
+    clean
+    ;;
+  *)
+    grep '#. ' $0
+esac
+
diff --git a/tools/kubernetes/demo_deploy.sh b/tools/kubernetes/demo_deploy.sh
index 19feb91..7138224 100644
--- a/tools/kubernetes/demo_deploy.sh
+++ b/tools/kubernetes/demo_deploy.sh
@@ -43,7 +43,9 @@ key=$1
 nodes="$2"
 admin_ip=$3
 agent_ips="$4"
-extras=$5
+priv_net=$5
+pub_net=$6
+extras=$7
 
 source ~/models/tools/maas/deploy.sh $1 "$2" $5
 eval `ssh-agent`
@@ -73,9 +75,12 @@ cd models/tools/prometheus
 bash prometheus-tools.sh all "$agent_ips"
 EOF
 echo "Setting up cloudify..."
-scp -o StrictHostKeyChecking=no ~/models/tools/cloudify/k8s-cloudify.sh \
+scp -r -o StrictHostKeyChecking=no ~/models/tools/cloudify \
   ubuntu@$admin_ip:/home/ubuntu/.
-ssh -x -o StrictHostKeyChecking=no ubuntu@$admin_ip bash k8s-cloudify.sh prereqs
-ssh -x -o StrictHostKeyChecking=no ubuntu@$admin_ip bash k8s-cloudify.sh setup
-ssh -x -o StrictHostKeyChecking=no ubuntu@$admin_ip bash k8s-cloudify.sh demo
+ssh -x -o StrictHostKeyChecking=no ubuntu@$admin_ip \
+  bash cloudify/k8s-cloudify.sh prereqs
+ssh -x -o StrictHostKeyChecking=no ubuntu@$admin_ip \
+  bash cloudify/k8s-cloudify.sh setup
+ssh -x -o StrictHostKeyChecking=no ubuntu@$admin_ip \
+  bash cloudify/k8s-cloudify.sh demo
 echo "All done!"