From b71491890de39d5652ce85ea5fd23c1dd1dad0b5 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Mon, 23 Feb 2015 15:56:04 +0000
Subject: Add novnc

---
 openstack-nova-compute.configure      | 41 -----------------------------------
 strata/openstack-services.morph       |  6 +++++
 strata/openstack-services/novnc.morph | 11 ++++++++++
 3 files changed, 17 insertions(+), 41 deletions(-)
 delete mode 100644 openstack-nova-compute.configure
 create mode 100644 strata/openstack-services/novnc.morph

diff --git a/openstack-nova-compute.configure b/openstack-nova-compute.configure
deleted file mode 100644
index 9487c759..00000000
--- a/openstack-nova-compute.configure
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2014 Codethink Limited
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-set -e
-
-ROOT="$1"
-
-##########################################################################
-# Substitutions in configuration files
-##########################################################################
-
-cat <<EOF > "$ROOT"/etc/openstack-nova-compute-setup.sed
-s/##NOVA_SERVICE_USER##/$NOVA_SERVICE_USER/g
-s/##NOVA_SERVICE_PASSWORD##/$NOVA_SERVICE_PASSWORD/g
-s/##NOVA_PUBLIC_URL##/$NOVA_PUBLIC_URL/g
-s/##NOVA_INTERNAL_URL##/$NOVA_INTERNAL_URL/g
-s/##NOVA_ADMIN_URL##/$NOVA_ADMIN_URL/g
-EOF
-
-sed -f "$ROOT"/etc/openstack-nova-compute-setup.sed -i \
-       "$ROOT"/etc/nova/nova.conf \
-       "$ROOT"/usr/share/openstack/openstack-nova-compute-setup 
-
-##########################################################################
-
-ln -s "/etc/systemd/system/openstack-nova-compute-setup.service" \
-    "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-nova-compute-setup.service"
diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index f81eac63..95d430bf 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -841,3 +841,9 @@ chunks:
   unpetrify-ref: 2014.2.1
   build-depends:
   - django-openstack-auth
+- name: novnc
+  morph: strata/openstack-services/novnc.morph
+  repo: https://github.com/kanaka/noVNC.git
+  ref: fc00821eba469641c6c94706726c3d78e46460a2
+  unpetrify-ref: v0.5.1
+  build-depends: []
diff --git a/strata/openstack-services/novnc.morph b/strata/openstack-services/novnc.morph
new file mode 100644
index 00000000..858320a0
--- /dev/null
+++ b/strata/openstack-services/novnc.morph
@@ -0,0 +1,11 @@
+name: novnc
+kind: chunk
+install-commands:
+- mkdir -p "$DESTDIR$PREFIX"/share/novnc/utils
+- install -m 444 *html "$DESTDIR$PREFIX"/share/novnc
+- install -m 444 vnc.html "$DESTDIR$PREFIX"/share/novnc/index.html
+- mkdir -p "$DESTDIR$PREFIX"/share/novnc/include
+- install -m 444 include/*.*  "$DESTDIR$PREFIX"/share/novnc/include
+- mkdir -p "$DESTDIR$PREFIX"/share/novnc/images
+- install -m 444 images/*.*  "$DESTDIR$PREFIX"/share/novnc/images
+- install -d "$DESTDIR"/etc/sysconfig
-- 
cgit v1.2.1