From d27c778e3c65c7c123e88ffd9aafee404d73208e Mon Sep 17 00:00:00 2001
From: Flavio Percoco <flaper87@gmail.com>
Date: Wed, 7 Jun 2017 13:45:37 +0200
Subject: [PATCH] Don't create networks if neutron is not enabled

With the composable undercloud installer, it's possible to disable
services.  The extraconfig script assumes both, neutron and nova, are
installed and fails if they aren't.

This patch checks if those services are available before.

Change-Id: Idcc2b9809fcfa92649a0a1f45175ce417dc0e608
---
 extraconfig/post_deploy/undercloud_post.sh | 90 +++++++++++-----------
 1 file changed, 47 insertions(+), 43 deletions(-)

diff --git a/extraconfig/post_deploy/undercloud_post.sh b/extraconfig/post_deploy/undercloud_post.sh
index 8bcae1d372..3c508d11d6 100755
--- a/extraconfig/post_deploy/undercloud_post.sh
+++ b/extraconfig/post_deploy/undercloud_post.sh
@@ -45,58 +45,62 @@ if ! grep "$(cat /root/.ssh/id_rsa.pub)" /root/.ssh/authorized_keys; then
     cat /root/.ssh/id_rsa.pub >> /root/.ssh/authorized_keys
 fi
 
-PHYSICAL_NETWORK=ctlplane
+if [ "$(hiera neutron_api_enabled)" = "true" ]; then
+    PHYSICAL_NETWORK=ctlplane
 
-ctlplane_id=$(openstack network list -f csv -c ID -c Name --quote none | tail -n +2 | grep ctlplane | cut -d, -f1)
-subnet_ids=$(openstack subnet list -f csv -c ID --quote none | tail -n +2)
-subnet_id=
+    ctlplane_id=$(openstack network list -f csv -c ID -c Name --quote none | tail -n +2 | grep ctlplane | cut -d, -f1)
+    subnet_ids=$(openstack subnet list -f csv -c ID --quote none | tail -n +2)
+    subnet_id=
 
-for subnet_id in $subnet_ids; do
-    network_id=$(openstack subnet show -f value -c network_id $subnet_id)
-    if [ "$network_id" = "$ctlplane_id" ]; then
-        break
+    for subnet_id in $subnet_ids; do
+        network_id=$(openstack subnet show -f value -c network_id $subnet_id)
+        if [ "$network_id" = "$ctlplane_id" ]; then
+            break
+        fi
+    done
+
+    net_create=1
+    if [ -n "$subnet_id" ]; then
+        cidr=$(openstack subnet show $subnet_id -f value -c cidr)
+        if [ "$cidr" = "$undercloud_network_cidr" ]; then
+            net_create=0
+        else
+            echo "New cidr $undercloud_network_cidr does not equal old cidr $cidr"
+            echo "Will attempt to delete and recreate subnet $subnet_id"
+        fi
     fi
-done
 
-net_create=1
-if [ -n "$subnet_id" ]; then
-    cidr=$(openstack subnet show $subnet_id -f value -c cidr)
-    if [ "$cidr" = "$undercloud_network_cidr" ]; then
-        net_create=0
-    else
-        echo "New cidr $undercloud_network_cidr does not equal old cidr $cidr"
-        echo "Will attempt to delete and recreate subnet $subnet_id"
+    if [ "$net_create" -eq "1" ]; then
+        # Delete the subnet and network to make sure it doesn't already exist
+        if openstack subnet list | grep start; then
+            openstack subnet delete $(openstack subnet list | grep start | awk '{print $4}')
+        fi
+        if openstack network show ctlplane; then
+            openstack network delete ctlplane
+        fi
+
+
+        NETWORK_ID=$(openstack network create --provider-network-type=flat --provider-physical-network=ctlplane ctlplane | grep " id " | awk '{print $4}')
+
+        NAMESERVER_ARG=""
+        if [ -n "${undercloud_nameserver:-}" ]; then
+            NAMESERVER_ARG="--dns-nameserver $undercloud_nameserver"
+        fi
+
+        openstack subnet create --network=$NETWORK_ID \
+            --gateway=$undercloud_network_gateway \
+            --subnet-range=$undercloud_network_cidr \
+            --allocation-pool start=$undercloud_dhcp_start,end=$undercloud_dhcp_end \
+            --host-route destination=169.254.169.254/32,gateway=$local_ip \
+            $NAMESERVER_ARG ctlplane
     fi
 fi
 
-if [ "$net_create" -eq "1" ]; then
-    # Delete the subnet and network to make sure it doesn't already exist
-    if openstack subnet list | grep start; then
-        openstack subnet delete $(openstack subnet list | grep start | awk '{print $4}')
-    fi
-    if openstack network show ctlplane; then
-        openstack network delete ctlplane
-    fi
-
-
-    NETWORK_ID=$(openstack network create --provider-network-type=flat --provider-physical-network=ctlplane ctlplane | grep " id " | awk '{print $4}')
-
-    NAMESERVER_ARG=""
-    if [ -n "${undercloud_nameserver:-}" ]; then
-        NAMESERVER_ARG="--dns-nameserver $undercloud_nameserver"
-    fi
-
-    openstack subnet create --network=$NETWORK_ID \
-        --gateway=$undercloud_network_gateway \
-        --subnet-range=$undercloud_network_cidr \
-        --allocation-pool start=$undercloud_dhcp_start,end=$undercloud_dhcp_end \
-        --host-route destination=169.254.169.254/32,gateway=$local_ip \
-        $NAMESERVER_ARG ctlplane
+if [ "$(hiera nova_api_enabled)" = "true" ]; then
+    # Disable nova quotas
+    openstack quota set --cores -1 --instances -1 --ram -1 $(openstack project show admin | awk '$2=="id" {print $4}')
 fi
 
-# Disable nova quotas
-openstack quota set --cores -1 --instances -1 --ram -1 $(openstack project show admin | awk '$2=="id" {print $4}')
-
 # MISTRAL WORKFLOW CONFIGURATION
 if [ "$(hiera mistral_api_enabled)" = "true" ]; then
     # load workflows