Merge branch 'arcus/wallaby-staging' into 'arcus/wallaby-production'

Sync arcus/wallaby staging to arcus/wallaby-production

See merge request !385

etc/kayobe/ironic.yml

@@ -100,7 +100,7 @@ kolla_ironic_enabled_rescue_interfaces:
 
 # Default rescue interface to be used for nodes that do not have
 # rescue_interface field set.
-kolla_ironic_default_rescue_interface: no-rescue
+kolla_ironic_default_rescue_interface: agent
 
 # Specify the list of storage interfaces to load during
 # service initialization.

etc/kayobe/kolla/config/ironic/ironic-api.conf

@@ -4,3 +4,4 @@ rpc_response_timeout = 120
 
 [neutron]
 timeout = 300
+rescuing_network = cleaning-net

etc/kayobe/kolla/config/ironic/ironic-conductor.conf

@@ -72,8 +72,7 @@ timeout = 300
 request_timeout = 300
 # Get some debug info
 #collect_timing = true
-# TODO: move to network name shared between environments!
-rescuing_network = 7f5111f3-c6c8-4518-9686-637276e89197
+rescuing_network = cleaning-net
 
 [glance]
 # Retry image download at least once if failure