summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2015-03-20 14:29:32 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2015-03-20 15:22:30 (GMT)
commit4c37effedcc8fde1788c5f48dbb72ba9504a8828 (patch)
tree492aa6f23132edf83a8303e69a841f11818a830f
parent63a9f92f328999fb2961c0f754c8e78604d0df03 (diff)
downloaddefinitions-baserock/richardmaw/openstack-v4/reliability-rebase.tar.gz
This enables serial console access to local nodes from the host machine by running `novaconsole $VM_NAME` after it has been installed by running pip install git+http://github.com/larsks/novaconsole.git
-rw-r--r--openstack/etc/nova/nova.conf8
-rw-r--r--openstack/etc/systemd/system/openstack-nova-serialproxy.service11
-rw-r--r--openstack/manifest1
-rw-r--r--openstack/usr/share/openstack/openstack-nova-setup4
4 files changed, 22 insertions, 2 deletions
diff --git a/openstack/etc/nova/nova.conf b/openstack/etc/nova/nova.conf
index 8f2dee4..c9ff85f 100644
--- a/openstack/etc/nova/nova.conf
+++ b/openstack/etc/nova/nova.conf
@@ -629,3 +629,11 @@ allow_resize_to_same_host=True
# Actual testing hardware does not support hardware acceleration
# so in this step we will configure libvirt to use qemu instead of KVM
virt_type=qemu
+
+##################
+# SERIAL CONSOLE #
+##################
+# Enable serial console proxy for serial console access from the host only
+[serial_console]
+serialproxy_host=127.0.0.1
+enabled=true
diff --git a/openstack/etc/systemd/system/openstack-nova-serialproxy.service b/openstack/etc/systemd/system/openstack-nova-serialproxy.service
new file mode 100644
index 0000000..2557dc2
--- /dev/null
+++ b/openstack/etc/systemd/system/openstack-nova-serialproxy.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=OpenStack Nova Serial Proxy
+After=syslog.target network.target
+
+[Service]
+Type=simple
+User=nova
+ExecStart=/usr/bin/nova-serialproxy --config-file /etc/nova/nova.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/openstack/manifest b/openstack/manifest
index 691b234..76e989d 100644
--- a/openstack/manifest
+++ b/openstack/manifest
@@ -47,6 +47,7 @@
0100644 0 0 /etc/systemd/system/openstack-nova-scheduler.service
0100644 0 0 /etc/systemd/system/openstack-nova-consoleauth.service
0100644 0 0 /etc/systemd/system/openstack-nova-novncproxy.service
+0100644 0 0 /etc/systemd/system/openstack-nova-serialproxy.service
0100644 0 0 /etc/systemd/system/openstack-nova-cert.service
0100644 0 0 /etc/systemd/system/openstack-rabbitmq-setup.service
0100644 0 0 /etc/systemd/system/openstack-rabbitmq-server.service
diff --git a/openstack/usr/share/openstack/openstack-nova-setup b/openstack/usr/share/openstack/openstack-nova-setup
index 778a69e..5935b13 100644
--- a/openstack/usr/share/openstack/openstack-nova-setup
+++ b/openstack/usr/share/openstack/openstack-nova-setup
@@ -100,13 +100,13 @@ rm /etc/systemd/system/multi-user.target.wants/openstack-nova-setup.service
# openstack-nova-compute or the security benefits of removing
# database access from nova-compute will be negated
#systemctl start openstack-nova-conductor
-for service in compute api cert consoleauth scheduler novncproxy; do
+for service in compute api cert consoleauth scheduler novncproxy serialproxy; do
systemctl start openstack-nova-$service.service
done
#systemctl start openstack-nova-xvpnvncproxy
# Create the links to run nova services when system start next times.
-for service in compute api cert consoleauth scheduler novncproxy; do
+for service in compute api cert consoleauth scheduler novncproxy serialproxy; do
systemctl enable openstack-nova-$service.service
done
# See description of why this shouldn't run in a openstack in one node in [1]