diff --git a/extraconfig/post_deploy/undercloud_ctlplane_network.py b/extraconfig/post_deploy/undercloud_ctlplane_network.py
index c85aabd2e0..42cc1bf942 100644
--- a/extraconfig/post_deploy/undercloud_ctlplane_network.py
+++ b/extraconfig/post_deploy/undercloud_ctlplane_network.py
@@ -260,8 +260,11 @@ def config_neutron_segments_and_subnets(sdk, ctlplane_id):
                 _ensure_neutron_router(sdk, name, subnet.id)
 
 
-
-if _run_command(['hiera', 'neutron_api_enabled'], name='hiera'):
+if 'true' not in _run_command(['hiera', 'neutron_api_enabled'],
+                              name='hiera').lower():
+    print('WARNING: UndercloudCtlplaneNetworkDeployment : The Neutron API '
+          'is disabled. The ctlplane network cannot be configured.')
+else:
     sdk = os_client_config.make_sdk(auth_url=AUTH_URL,
                                     project_name='admin',
                                     username='admin',
diff --git a/extraconfig/post_deploy/undercloud_post.yaml b/extraconfig/post_deploy/undercloud_post.yaml
index a736e9f1b1..1dfd2a6cea 100644
--- a/extraconfig/post_deploy/undercloud_post.yaml
+++ b/extraconfig/post_deploy/undercloud_post.yaml
@@ -184,6 +184,7 @@ resources:
 
   UndercloudCtlplaneNetworkDeployment:
     type: OS::Heat::SoftwareDeployments
+    depends_on: UndercloudPostDeployment
     properties:
       name: UndercloudCtlplaneNetworkDeployment
       servers: {get_param: servers}