Merge "Disable DVR, move baremetal interface to bridge" into stable/queens
diff --git a/classes/cluster/virtual-mcp11-aio-octavia/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-octavia/openstack/init.yml
index f3940ca..bd6fd50 100755
--- a/classes/cluster/virtual-mcp11-aio-octavia/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-octavia/openstack/init.yml
@@ -18,9 +18,13 @@
octavia_api_v1_enabled: true
octavia_api_v2_enabled: true
amp_flavor_id: 10
- octavia_hm_bind_ip: 192.168.0.12
+ octavia_hm_bind_ip: 192.168.10.12
+ octavia_lb_mgmt_cidr: 192.168.10.0/24
+ octavia_lb_mgmt_allocation_pool_start: 192.168.10.2
+ octavia_lb_mgmt_allocation_pool_end: 192.168.10.200
# there is reference binding_host_id: ${_param:openstack_gateway_node01_hostname} in
# salt-models/reclass-system/neutron/client/service/octavia.yml
openstack_gateway_node01_hostname: ${_param:infra_config_hostname}
octavia_public_key: |
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDnN4SKRSb/0lYXUfjZ6+VfsxoGV0yx5lB30ErbsVOdbSihw9KEIB16jn6EhmYemId2DBMuTY3KcXTbE2KaH0USTVYgxtQPvzx5gG4G8itybYpGNnnTJEdPhAcmAIgzXi7aUmMXpopziUyEoNki86ArL8uv3r8IOD+j37yLNPWfV27CD3ejpVm27xTib31T8gNN6OQHSeV4G1W8Fw5wscvlycbsqhGDzaPxyXV4rVoObtF9FG87UBIfs2k1F4M5aikRMnH1FihjGMZTozwxc+9gQaacYsPrglUAkBGigzZxgsiGZN+xVLwhvjABHC56E8ufQIR02JBtLR1cKdz7iyfB root@cfg01
+
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 3f9b2d0..f893f39 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -18,6 +18,7 @@
- system.galera.server.database.heat
- system.galera.server.database.keystone
- system.galera.server.database.nova
+- system.galera.server.database.neutron
- system.keystone.client.single
- system.keystone.client.service.cinder3
- system.keystone.client.service.nova21
diff --git a/classes/system b/classes/system
index 141c460..ff423ed 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 141c4605aa229fa60ce49de73d4419eafc3df6a1
+Subproject commit ff423edff0ff6be9871f89abf89fe3fb2d80f777