aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmcp/config/states/networks10
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml2
2 files changed, 6 insertions, 6 deletions
diff --git a/mcp/config/states/networks b/mcp/config/states/networks
index d4735adb3..5beabdb6a 100755
--- a/mcp/config/states/networks
+++ b/mcp/config/states/networks
@@ -11,24 +11,24 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || 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 | \
+PUBLIC_NET=$(salt --out yaml -C 'I@nova:compute and *01*' 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*' \
+[ -n "${PUBLIC_NET}" ] || PUBLIC_NET=$(salt --out yaml -C 'I@nova:compute and *01*' \
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; \
+salt -C 'I@nova:controller and *01*' 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; \
+salt -C 'I@nova:controller and *01*' 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; \
+salt -C 'I@nova:controller and *01*' 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"
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml
index cef2a8881..c81493e0f 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml
@@ -20,7 +20,7 @@ parameters:
proto: dhcp
name: ${_param:dhcp_nic}
route:
- mcpcontol:
+ mcpcontrol:
address: ${_param:opnfv_net_mcpcontrol}
netmask: ${_param:opnfv_net_mcpcontrol_mask}
gateway: ${_param:opnfv_infra_maas_node01_deploy_address}