summaryrefslogtreecommitdiffstats
path: root/tools/cloudify
diff options
context:
space:
mode:
authorBryan Sullivan <bryan.sullivan@att.com>2017-10-28 12:02:38 -0700
committerBryan Sullivan <bryan.sullivan@att.com>2017-10-28 12:02:38 -0700
commit4518364b4ce515884eadf476ae6db021210bd7f0 (patch)
tree6492a0d7b36baa59bbe742d78a69dd372febcebc /tools/cloudify
parent8ebd401c062a3b657bb926422bb627d9edf6310d (diff)
Clean trailing spaces; ceph-helm.sh further work
JIRA: MODELS-23 Change-Id: I6f9ef087219ad2f6a736d1027efda2eaf16abcff Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
Diffstat (limited to 'tools/cloudify')
-rw-r--r--tools/cloudify/k8s-cloudify.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/cloudify/k8s-cloudify.sh b/tools/cloudify/k8s-cloudify.sh
index fe85697..61245f6 100644
--- a/tools/cloudify/k8s-cloudify.sh
+++ b/tools/cloudify/k8s-cloudify.sh
@@ -14,12 +14,12 @@
# limitations under the License.
#
#. What this is: Setup script for Cloudify use with Kubernetes.
-#. Prerequisites:
+#. 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/.
+#. $ 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
@@ -31,7 +31,7 @@ function prereqs() {
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).
+ # 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
@@ -72,7 +72,7 @@ function setup () {
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
@@ -84,7 +84,7 @@ function setup () {
# 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"
+ 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