Workaround VCP minions timeout post pkg.upgrade

[fuel.git] / mcp / config / states / networks

diff --git a/mcp/config/states/networks b/mcp/config/states/networks
index 10f71c2..505153a 100755 (executable)
--- a/mcp/config/states/networks
+++ b/mcp/config/states/networks
@@ -1,3 +1,26 @@
-salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack compute service list; openstack network agent list; openstack stack list; openstack volume list"
-salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack network create --share --external --provider-network-type flat --provider-physical-network physnet1 floating_net"
-salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack subnet create --gateway 10.16.0.1 --no-dhcp --allocation-pool start=10.16.0.130,end=10.16.0.254 --network floating_net --subnet-range 10.16.0.0/24 floating_subnet"
+#!/bin/bash
+set -x
+
+# Determine public network based on external IPs from compute node
+# NOTE: mask currently hardcoded to /24
+PUBLIC_NET=$(salt --out yaml 'cmp*' pillar.get _param:external_address | \
+  awk --re-interval '/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/{print $2; exit}')
+
+[ -n "${PUBLIC_NET}" ] || PUBLIC_NET=$(salt --out yaml 'cmp*' \
+  pillar.get _param:openstack_compute_node01_external_address | \
+  awk --re-interval '/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/{print $2; exit}')
+
+[ -n "${PUBLIC_NET}" ] && PUBLIC_NET="${PUBLIC_NET%.*}.0/24" || PUBLIC_NET="10.16.0.0/24"
+
+salt 'ctl01*' cmd.run ". /root/keystonercv3; \
+  openstack compute service list; \
+  openstack network agent list; \
+  openstack stack list; \
+  openstack volume service list"
+salt 'ctl01*' cmd.run ". /root/keystonercv3; \
+  openstack network create --external --default --provider-network-type flat \
+    --provider-physical-network physnet1 floating_net"
+salt 'ctl01*' cmd.run ". /root/keystonercv3; \
+  openstack subnet create --gateway ${PUBLIC_NET%.*}.1 --no-dhcp \
+    --allocation-pool start=${PUBLIC_NET%.*}.130,end=${PUBLIC_NET%.*}.254 \
+    --network floating_net --subnet-range ${PUBLIC_NET} floating_subnet"