summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent S. Cojot <vcojot@redhat.com>2017-04-20 10:23:23 -0400
committerVincent S. Cojot <vcojot@redhat.com>2017-04-20 10:23:23 -0400
commitced59657bdfac6e766fffbbb6ca45c9cb1582f06 (patch)
treeef99b55ef58da1e7bea9774f36ac9b7d2291e4bc
parent77906b14fd7ea227a09c06d0fc5a796446aeb489 (diff)
downloadopenstack-access-policy-ced59657bdfac6e766fffbbb6ca45c9cb1582f06.zip
openstack-access-policy-ced59657bdfac6e766fffbbb6ca45c9cb1582f06.tar.gz
openstack-access-policy-ced59657bdfac6e766fffbbb6ca45c9cb1582f06.tar.xz
Cosmetic update to outputs..
-rwxr-xr-xfiles/push_readonly_policies_to_overcloud.sh3
-rwxr-xr-xfiles/restore_default_OSP_policies_on_overcloud.sh2
2 files changed, 3 insertions, 2 deletions
diff --git a/files/push_readonly_policies_to_overcloud.sh b/files/push_readonly_policies_to_overcloud.sh
index 5a4295b..307af39 100755
--- a/files/push_readonly_policies_to_overcloud.sh
+++ b/files/push_readonly_policies_to_overcloud.sh
@@ -102,7 +102,8 @@ do
# Take a backup, if not present already..
ssh -q heat-admin@${myip} "sudo test -f ${sev1_backup}"
if [ $? -ne 0 ]; then
- ssh -q heat-admin@${myip} "sudo test -f ${dst_config}" && ssh -q heat-admin@${myip} "sudo /bin/cp -afv ${dst_config} ${sev1_backup}"
+ echo" (II) Taking a backup of ${dst_config} as ${sev1_backup}"
+ ssh -q heat-admin@${myip} "sudo test -f ${dst_config}" && ssh -q heat-admin@${myip} "sudo /bin/cp -afx ${dst_config} ${sev1_backup}"
fi
# Compare files and copy if necessary...
diff --git a/files/restore_default_OSP_policies_on_overcloud.sh b/files/restore_default_OSP_policies_on_overcloud.sh
index 2b8563d..7578543 100755
--- a/files/restore_default_OSP_policies_on_overcloud.sh
+++ b/files/restore_default_OSP_policies_on_overcloud.sh
@@ -97,7 +97,7 @@ do
else
# Overwrite service config file....
echo " (WW) Restoring ${myctrl}:${sev1_backup} to ${myctrl}:${dst_config} ..."
- ssh -q heat-admin@${myip} "sudo /bin/cp -afv ${sev1_backup} ${dst_config} && sudo /bin/rm -f ${sev1_backup}"
+ ssh -q heat-admin@${myip} "sudo /bin/cp -afx ${sev1_backup} ${dst_config} && sudo /bin/rm -f ${sev1_backup}"
# Repairs permissions and SELinux context:
ssh -q heat-admin@${myip} "sudo chown root:${mysvc} ${dst_config} && sudo chmod 640 ${dst_config}"