Partial-Bug: #1488259 smlite changes for packaging changes

-Set correct permission for provision log dir. Change-Id: I94bae0af87936e2d805b3765347128330c01f5e9
Juniper · Sep 1, 2015 · 16dfcb3 · 16dfcb3
1 parent 89d7c93
commit 16dfcb3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/common/debian/contrail-server-manager-lite/debian/postinst b/common/debian/contrail-server-manager-lite/debian/postinst
@@ -22,7 +22,7 @@ cp -r /etc/contrail_smgr/kickstarts /var/www/html/
 cp /etc/contrail_smgr/sendmail.cf.sample /etc/mail/sendmail.cf
 mv /etc/ntp.conf /etc/ntp.conf.default
 cp /etc/contrail_smgr/ntp.conf.sample /etc/ntp.conf
-
+chown -R puppet:puppet /var/log/contrail-server-manger/provision
 easy_install argparse
 easy_install paramiko
 easy_install pycrypto

diff --git a/common/debian/contrail-server-manager-lite/debian/rules b/common/debian/contrail-server-manager-lite/debian/rules
@@ -85,7 +85,7 @@ override_dh_auto_install:
 	install -d -m 755 $(build_root)/var/www/html/contrail/images/
 	install -d -m 755 $(build_root)/var/www/html/contrail/config_file/
 	install -d -m 755 $(build_root)/var/www/html/thirdparty_packages/
-	install -d -m 777 $(build_root)/var/log/contrail-server-manager/provision/
+	install -d $(build_root)/var/log/contrail-server-manager/provision/
 	install -d -m 755 $(build_root)/etc/mail/
 	# Copy/install files
 	install -p -m 755 $(src_path)/reprepro/conf/distributions $(build_root)/opt/contrail/server_manager/reprepro/conf/distributions

diff --git a/common/debian/contrail-server-manager/debian/postinst b/common/debian/contrail-server-manager/debian/postinst
@@ -43,7 +43,7 @@ cp -r /etc/contrail_smgr/kickstarts /var/www/html/
 #cp /etc/contrail_smgr/sendmail.cf /etc/mail/
 #mv /etc/ntp.conf /etc/ntp.conf.default
 #cp /etc/contrail_smgr/ntp.conf /etc/ntp.conf
-
+chown -R puppet:puppet /var/log/contrail-server-manager/provision
 # Copying the specific puppet conf files needed for provisioning:
 cp /etc/contrail_smgr/puppet/auth.conf /etc/puppet/
 cp /etc/contrail_smgr/puppet/autosign.conf /etc/puppet/

diff --git a/common/debian/contrail-server-manager/debian/rules b/common/debian/contrail-server-manager/debian/rules
@@ -88,7 +88,7 @@ override_dh_auto_install:
 	install -d -m 755 $(build_root)/var/www/html/contrail/images/
 	install -d -m 755 $(build_root)/var/www/html/contrail/config_file/
 	install -d -m 755 $(build_root)/var/www/html/thirdparty_packages/
-	install -d -m 777 $(build_root)/var/log/contrail-server-manager/provision/
+	install -d $(build_root)/var/log/contrail-server-manager/provision/
 	install -d -m 755 $(build_root)/etc/mail/
 	# Copy/install files - Python scripts
 	cp -r $(src_path)/server_mgr_main.py $(build_root)/opt/contrail/server_manager/