Merge "Adding ability to set DEFAULT/host"
diff --git a/README.rst b/README.rst
index e5dc847..f7102e1 100644
--- a/README.rst
+++ b/README.rst
@@ -208,6 +208,7 @@
qemu:
max_files: 4096
max_processes: 4096
+ host: node-12.domain.tld
Group membership for user nova (upgrade related)
diff --git a/nova/files/juno/nova-compute.conf.Debian b/nova/files/juno/nova-compute.conf.Debian
index 44c3fc5..37fce03 100644
--- a/nova/files/juno/nova-compute.conf.Debian
+++ b/nova/files/juno/nova-compute.conf.Debian
@@ -18,6 +18,9 @@
{%- if compute.my_ip is defined %}
my_ip={{ compute.my_ip }}
{%- endif %}
+{%- if compute.host is defined %}
+host={{ compute.host }}
+{%- endif %}
allow_resize_to_same_host=True
diff --git a/nova/files/kilo/nova-compute.conf.Debian b/nova/files/kilo/nova-compute.conf.Debian
index 018a149..f87f5ad 100644
--- a/nova/files/kilo/nova-compute.conf.Debian
+++ b/nova/files/kilo/nova-compute.conf.Debian
@@ -20,7 +20,9 @@
{%- if compute.my_ip is defined %}
my_ip={{ compute.my_ip }}
{%- endif %}
-
+{%- if compute.host is defined %}
+host={{ compute.host }}
+{%- endif %}
{%- if compute.image.use_cow is defined %}
use_cow_images = {{ compute.image.use_cow }}
diff --git a/nova/files/liberty/nova-compute.conf.Debian b/nova/files/liberty/nova-compute.conf.Debian
index eb27ac5..3f2074c 100644
--- a/nova/files/liberty/nova-compute.conf.Debian
+++ b/nova/files/liberty/nova-compute.conf.Debian
@@ -27,6 +27,9 @@
{%- if compute.my_ip is defined %}
my_ip={{ compute.my_ip }}
{%- endif %}
+{%- if compute.host is defined %}
+host={{ compute.host }}
+{%- endif %}
reserved_host_memory_mb = {{ compute.get('reserved_host_memory_mb', '512') }}
diff --git a/nova/files/mitaka/nova-compute.conf.Debian b/nova/files/mitaka/nova-compute.conf.Debian
index 6d8677c..316ab71 100644
--- a/nova/files/mitaka/nova-compute.conf.Debian
+++ b/nova/files/mitaka/nova-compute.conf.Debian
@@ -30,6 +30,9 @@
{%- if compute.my_ip is defined %}
my_ip={{ compute.my_ip }}
{%- endif %}
+{%- if compute.host is defined %}
+host={{ compute.host }}
+{%- endif %}
remove_unused_original_minimum_age_seconds=86400
image_service=nova.image.glance.GlanceImageService
diff --git a/nova/files/newton/nova-compute.conf.Debian b/nova/files/newton/nova-compute.conf.Debian
index 4c554cf..ee4525d 100644
--- a/nova/files/newton/nova-compute.conf.Debian
+++ b/nova/files/newton/nova-compute.conf.Debian
@@ -32,6 +32,9 @@
{%- if compute.my_ip is defined %}
my_ip={{ compute.my_ip }}
{%- endif %}
+{%- if compute.host is defined %}
+host={{ compute.host }}
+{%- endif %}
remove_unused_original_minimum_age_seconds=86400
image_service=nova.image.glance.GlanceImageService
diff --git a/nova/files/ocata/nova-compute.conf.Debian b/nova/files/ocata/nova-compute.conf.Debian
index a7680c8..0e21b2e 100644
--- a/nova/files/ocata/nova-compute.conf.Debian
+++ b/nova/files/ocata/nova-compute.conf.Debian
@@ -1539,6 +1539,9 @@
# * String with hostname, FQDN or IP address. Default is hostname of this host.
# (string value)
#host=lcy01-22
+{%- if compute.host is defined %}
+host={{ compute.host }}
+{%- endif %}
#
# Assign IPv6 and IPv4 addresses when creating instances.