diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-18 15:39:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-18 15:39:01 +0000 |
| commit | 5ceea06b5395115e0e45d0631e726062eb1b0d13 (patch) | |
| tree | e2c37cf773fdc73cd14601e1e8328598e6e53da0 /mcp/config/states/networks | |
| parent | 8673180dad54592382f339dba35cd3d753c5d18e (diff) | |
| parent | 31bfb4c7b897475593016474bf00bf0af3ae871d (diff) | |
Merge "states: networks: Use role-based addressing"
Diffstat (limited to 'mcp/config/states/networks')
| -rwxr-xr-x | mcp/config/states/networks | 10 |
1 files changed, 5 insertions, 5 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" |