diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-01-04 15:54:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-04 15:54:15 +0000 |
| commit | d440624d1965100d8c68c3da1466b40b3e4d8f6d (patch) | |
| tree | 2d7a9d3d5c4a76b9ece0618aa59f56d048609ef6 /ci | |
| parent | 66085844d8d343978cfedb6fee7b144cd099805f (diff) | |
| parent | cd890bcf3bacc4c28a2e4b3716eca6677d7355bb (diff) | |
Merge "cleaning out some tarball manipulations from Makefile that are unnessesary"
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 1d9a3bb9..47b82353 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -479,7 +479,7 @@ if [ -n "$DEPLOY_SETTINGS_FILE" ]; then openstack-config --set undercloud.conf DEFAULT inspection_iprange ${deploy_options_array['provisioning_inspection_iprange']} openstack-config --set undercloud.conf DEFAULT undercloud_debug false - if [ -n "$net_isolation_enabled" ]; then + if [ -n "$net_isolation_enabled" ]; then sed -i '/ControlPlaneSubnetCidr/c\\ ControlPlaneSubnetCidr: "${deploy_options_array['provisioning_cidr']##*/}"' network-environment.yaml sed -i '/ControlPlaneDefaultRoute/c\\ ControlPlaneDefaultRoute: ${deploy_options_array['provisioning_gateway']}' network-environment.yaml sed -i '/ExternalNetCidr/c\\ ExternalNetCidr: ${deploy_options_array['ext_net_cidr']}' network-environment.yaml |