From 53003f9fef6b49304f37e5fbb5d15bc4f1316948 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Tue, 29 Mar 2016 15:15:44 -0400 Subject: Syntax updates to OOO network isolation file - storage mgmt and storage were being update by the storage sed commands - ext net had a double Ports:: in the line Change-Id: I95cfdbced1e817e6e69805708b6b4e504abd8c43 Signed-off-by: Dan Radez --- ci/deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ci') diff --git a/ci/deploy.sh b/ci/deploy.sh index 47ab59c1..8aeb5f5f 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -701,14 +701,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 -- cgit 1.2.3-korg