Merge "Bug# 1415111 Adding Base OS with kickstarts specfied fails whe…

…n added for first time with no image added - images directory is missing as part of the installation" into R2.1
Juniper · Feb 9, 2015 · 05cce59 · 05cce59
2 parents cb8d6fc + 7b11326
commit 05cce59
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/common/debian/contrail-server-manager/debian/postinst b/common/debian/contrail-server-manager/debian/postinst
@@ -35,6 +35,7 @@ mkdir -p /var/www/html/kickstarts
 cp -r /etc/contrail_smgr/kickstarts /var/www/html/
 mkdir -p /var/www/html/contrail
 mkdir -p /var/www/html/contrail/config_file
+mkdir -p /var/www/html/contrail/images
 mkdir -p /var/log/contrail-server-manager
 mkdir -p /etc/mail/
 cp /etc/contrail_smgr/sendmail.cf /etc/mail/

diff --git a/common/rpm/contrail-server-manager.spec b/common/rpm/contrail-server-manager.spec
@@ -171,6 +171,7 @@ fi
 cp -r /usr/bin/server_manager/kickstarts /var/www/html/
 mkdir -p /var/www/html/contrail
 mkdir -p /var/www/html/contrail/config_file
+mkdir -p /var/www/html/contrail/images
 mkdir -p /var/log/contrail-server-manager/
 
 cp -u /etc/puppet/puppet_init_rd /var/www/cobbler/aux/puppet