summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-03-30 12:39:59 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-03-30 12:39:59 +0000
commitbf55ef0fc2c197bbcd76f9778398ac22c3371979 (patch)
tree5236edd9a51a5e6665767ac31085fe1a8e7df8a1
parent5f4af1626f8bf7cdc32dbd38cb0a3f79fb1060b6 (diff)
parent2456bc1a53e0458e4652e0afe12a32409feb6ee5 (diff)
Merge "Syntax updates to OOO network isolation file" into stable/brahmaputra
-rw-r--r--build/network-environment.yaml2
-rwxr-xr-xci/deploy.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/build/network-environment.yaml b/build/network-environment.yaml
index f9aa41c..4c6923d 100644
--- a/build/network-environment.yaml
+++ b/build/network-environment.yaml
@@ -19,7 +19,7 @@ resource_registry:
OS::TripleO::Compute::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml
OS::TripleO::Compute::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml
OS::TripleO::Compute::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml
- OS::TripleO::Compute::Ports::Ports::ExternalPort: /usr/share/openstack-tripleo-heat-templates/network/ports/external.yaml
+ OS::TripleO::Compute::Ports::ExternalPort: /usr/share/openstack-tripleo-heat-templates/network/ports/external.yaml
# Port assignments for service virtual IPs for the controller role
OS::TripleO::Controller::Ports::RedisVipPort: /usr/share/openstack-tripleo-heat-templates/network/ports/noop.yaml
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 01d8371..1d2655c 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -649,14 +649,14 @@ function configure_network_environment {
# check for storage network
if [[ ! -z "$storage_network_enabled" && "$storage_network_enabled" == "true" ]]; then
- sed -i 's#^.*Network::Storage.*$# OS::TripleO::Network::Storage: '${tht_dir}'/storage.yaml#' $1
+ sed -i 's#^.*Network::Storage:.*$# OS::TripleO::Network::Storage: '${tht_dir}'/storage.yaml#' $1
sed -i 's#^.*Controller::Ports::StoragePort:.*$# OS::TripleO::Controller::Ports::StoragePort: '${tht_dir}'/ports/storage.yaml#' $1
sed -i 's#^.*Compute::Ports::StoragePort:.*$# OS::TripleO::Compute::Ports::StoragePort: '${tht_dir}'/ports/storage.yaml#' $1
sed -i "/StorageAllocationPools/c\\ StorageAllocationPools: [{'start': '${storage_network_usable_ip_range%%,*}', 'end': '${storage_network_usable_ip_range##*,}'}]" $1
sed -i '/StorageNetCidr/c\\ StorageNetCidr: '${storage_network_cidr}'' $1
nic_ext+=_storage
else
- sed -i 's#^.*Network::Storage.*$# OS::TripleO::Network::Storage: '${tht_dir}'/noop.yaml#' $1
+ sed -i 's#^.*Network::Storage:.*$# OS::TripleO::Network::Storage: '${tht_dir}'/noop.yaml#' $1
sed -i 's#^.*Controller::Ports::StoragePort:.*$# OS::TripleO::Controller::Ports::StoragePort: '${tht_dir}'/ports/noop.yaml#' $1
sed -i 's#^.*Compute::Ports::StoragePort:.*$# OS::TripleO::Compute::Ports::StoragePort: '${tht_dir}'/ports/noop.yaml#' $1
fi