Merge "Formulas testing revision 2019/10"
diff --git a/README.rst b/README.rst
index dfd3de0..210b7ef 100644
--- a/README.rst
+++ b/README.rst
@@ -33,6 +33,7 @@
agent_down_time: 30
dhcp_agents_per_network: 2
allow_automatic_dhcp_failover: true
+ host: myhostname.example.com
bind:
address: 172.20.0.1
port: 9696
@@ -219,6 +220,7 @@
report_interval: 10
dhcp_lease_duration: 600
firewall_driver: iptables_hybrid
+ host: gtw01.example.com
message_queue:
engine: rabbitmq
host: 127.0.0.1
@@ -253,6 +255,7 @@
compute:
enabled: True
version: mitaka
+ host: cmp001.example.com
message_queue:
engine: rabbitmq
host: 127.0.0.1
diff --git a/neutron/files/kilo/neutron-server.conf b/neutron/files/kilo/neutron-server.conf
index 2d876c0..90bec89 100644
--- a/neutron/files/kilo/neutron-server.conf
+++ b/neutron/files/kilo/neutron-server.conf
@@ -96,6 +96,9 @@
# The default value is hostname of the machine.
#
# host =
+{%- if server.host is defined %}
+host={{ server.host }}
+{%- endif %}
# The strategy to be used for auth.
# Supported values are 'keystone'(default), 'noauth'.
@@ -1051,4 +1054,4 @@
service_provider = LOADBALANCER:Opencontrail:neutron_plugin_contrail.plugins.opencontrail.loadbalancer.driver.OpencontrailLoadbalancerDriver:default
{%- elif server.backend.engine == "midonet" %}
service_provider = LOADBALANCER:Midonet:midonet.neutron.services.loadbalancer.driver.MidonetLoadbalancerDriver:default
-{%- endif %}
\ No newline at end of file
+{%- endif %}
diff --git a/neutron/files/liberty/neutron-server.conf b/neutron/files/liberty/neutron-server.conf
index c374b9d..39495a3 100644
--- a/neutron/files/liberty/neutron-server.conf
+++ b/neutron/files/liberty/neutron-server.conf
@@ -96,6 +96,9 @@
# The default value is hostname of the machine.
#
# host =
+{%- if server.host is defined %}
+host={{ server.host }}
+{%- endif %}
# The strategy to be used for auth.
# Supported values are 'keystone'(default), 'noauth'.
diff --git a/neutron/files/newton/neutron-server.conf b/neutron/files/newton/neutron-server.conf
index 4be5241..b61cb37 100644
--- a/neutron/files/newton/neutron-server.conf
+++ b/neutron/files/newton/neutron-server.conf
@@ -148,6 +148,9 @@
# this machine. All the agents and services running on this machine must use
# the same host value. (string value)
#host = example.domain
+{%- if server.host is defined %}
+host={{ server.host }}
+{%- endif %}
# Ensure that configured gateway is on subnet. For IPv6, validate only if
# gateway is not a link local address. Deprecated, to be removed during the
diff --git a/neutron/files/ocata/neutron-server.conf b/neutron/files/ocata/neutron-server.conf
index 98b5e2d..c2ab206 100644
--- a/neutron/files/ocata/neutron-server.conf
+++ b/neutron/files/ocata/neutron-server.conf
@@ -135,6 +135,9 @@
# this machine. All the agents and services running on this machine must use
# the same host value. (string value)
#host = example.domain
+{%- if server.host is defined %}
+host={{ server.host }}
+{%- endif %}
# Send notification to nova when port status changes (boolean value)
#notify_nova_on_port_status_changes = true
diff --git a/neutron/files/pike/neutron-server.conf b/neutron/files/pike/neutron-server.conf
index bed4834..1e9c5e8 100644
--- a/neutron/files/pike/neutron-server.conf
+++ b/neutron/files/pike/neutron-server.conf
@@ -162,6 +162,9 @@
# this machine. All the agents and services running on this machine must use
# the same host value. (string value)
#host = example.domain
+{%- if server.host is defined %}
+host={{ server.host }}
+{%- endif %}
# Send notification to nova when port status changes (boolean value)
#notify_nova_on_port_status_changes = true
diff --git a/neutron/files/queens/l3_agent.ini b/neutron/files/queens/l3_agent.ini
index 339ab04..052c70b 100644
--- a/neutron/files/queens/l3_agent.ini
+++ b/neutron/files/queens/l3_agent.ini
@@ -199,6 +199,7 @@
# Availability zone of this node (string value)
#availability_zone = nova
+availability_zone = {{ neutron.availability_zone|default('nova') }}
#
# From neutron.base.agent
diff --git a/neutron/files/queens/neutron-generic.conf b/neutron/files/queens/neutron-generic.conf
index 6b47f46..274d549 100644
--- a/neutron/files/queens/neutron-generic.conf
+++ b/neutron/files/queens/neutron-generic.conf
@@ -67,6 +67,7 @@
# resource is empty, availability zone is considered for high availability
# while scheduling the resource. (list value)
#default_availability_zones =
+default_availability_zones = {{ neutron.availability_zone|default('nova') }}
# Maximum number of DNS nameservers per subnet (integer value)
#max_dns_nameservers = 5
@@ -106,6 +107,9 @@
# this machine. All the agents and services running on this machine must use
# the same host value. (unknown value)
#host = example.domain
+{%- if neutron.host is defined %}
+host={{ neutron.host }}
+{%- endif %}
# This string is prepended to the normal URL that is returned in links to the
# OpenStack Network API. If it is empty (the default), the URLs are returned
@@ -402,7 +406,7 @@
# Availability zone of this node (string value)
#availability_zone = nova
-
+availability_zone = {{ neutron.availability_zone|default('nova') }}
[cors]
{%- if neutron.cors is defined %}
diff --git a/neutron/files/queens/neutron-server.conf b/neutron/files/queens/neutron-server.conf
index 6825a09..fbfaa61 100644
--- a/neutron/files/queens/neutron-server.conf
+++ b/neutron/files/queens/neutron-server.conf
@@ -99,6 +99,7 @@
# resource is empty, availability zone is considered for high availability
# while scheduling the resource. (list value)
#default_availability_zones =
+default_availability_zones = {{ server.availability_zone|default('nova') }}
# Maximum number of DNS nameservers per subnet (integer value)
#max_dns_nameservers = 5
@@ -142,6 +143,9 @@
# this machine. All the agents and services running on this machine must use
# the same host value. (unknown value)
#host = example.domain
+{%- if server.host is defined %}
+host={{ server.host }}
+{%- endif %}
# This string is prepended to the normal URL that is returned in links to the
# OpenStack Network API. If it is empty (the default), the URLs are returned
@@ -447,7 +451,7 @@
# Availability zone of this node (string value)
#availability_zone = nova
-
+availability_zone = {{ server.availability_zone|default('nova') }}
[cors]
{%- if server.cors is defined %}
diff --git a/neutron/files/rocky/neutron-generic.conf b/neutron/files/rocky/neutron-generic.conf
index 35c22d5..922afd3 100644
--- a/neutron/files/rocky/neutron-generic.conf
+++ b/neutron/files/rocky/neutron-generic.conf
@@ -98,6 +98,9 @@
# this machine. All the agents and services running on this machine must use
# the same host value. (host address value)
#host = example.domain
+{%- if neutron.host is defined %}
+host={{ neutron.host }}
+{%- endif %}
# This string is prepended to the normal URL that is returned in links to the
# OpenStack Network API. If it is empty (the default), the URLs are returned
diff --git a/neutron/files/rocky/neutron-server.conf b/neutron/files/rocky/neutron-server.conf
index 51b99b7..841d398 100644
--- a/neutron/files/rocky/neutron-server.conf
+++ b/neutron/files/rocky/neutron-server.conf
@@ -129,6 +129,9 @@
# this machine. All the agents and services running on this machine must use
# the same host value. (host address value)
#host = example.domain
+{%- if server.host is defined %}
+host={{ server.host }}
+{%- endif %}
# This string is prepended to the normal URL that is returned in links to the
# OpenStack Network API. If it is empty (the default), the URLs are returned
diff --git a/tests/pillar/compute_dvr.sls b/tests/pillar/compute_dvr.sls
index 4071003..f78b3c3 100644
--- a/tests/pillar/compute_dvr.sls
+++ b/tests/pillar/compute_dvr.sls
@@ -4,6 +4,7 @@
dvr_base_mac: fa:16:3f:a0:00:00
agent_mode: dvr
report_interval: 10
+ host: cmp.example.com
backend:
engine: ml2
tenant_network_types: "flat,vxlan"