Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Squashed commit of all changes merged from R2.22-dev to master
Patch Set 3 Partial-Bug: #1488259 smlite changes for packaging changes - Add server manager lite deb packaging changes - Modify setup.sh to include server manager lite option - Add provision shell script to install server manager, create server manager objects and issue provision - Pre check/config for testbey.py specified servers for a cluster - Local repo pinning changes Change-Id: I45b4cf957a4c1f393e8068ee8eee2d9580d397a3 Related-Bug: #1488259 Bug introduced by preceding merge to R2.22-dev. The package libpython2.7=2.7.6-8ubuntu0.2 should only be installed in Ubuntu 14.04 Bug seen: the version 2.7.6-8ubuntu0.2 is not in precise repos Smgr install on Ubuntu12.04 fails. Change-Id: I3a7c212af4e091fd08b8725630657fd2fb4c4b2c Related-Bug: #1488259 - Simplifying setup script and moving configuration to Post Install Bulk of the changes made in setup script for server manager has been moved to Post install script of various packages Some packages added as dependencies in control files Rules files changes to prevent same files being overwritten with each install Remaining: Some packages are still being installed explicitly -> cobbler, puppetmaster-common, puppetmaster-python, libpython2.7 These packages have to be added to server-manager local repo Patch 2: Server Manager Install shows minimal outputs on console named.template and named.conf.options are now manual config steps Puppet agent certs are moved and not deleted on fresh install Other review comments implemented Patch 3: Found bug in the name of sendmail and ntp conf samples being copied Patch 4: set +e, set -e for a grep bug in puppet cert generate service restart for sm lite moved from postinst to setup script Change-Id: If871e843d0f9ef17fb67833ae18df13c283f3664 updates for sm-lite packages - use interface_setup.py from client package Closes-Bug: 1490779 Change-Id: I6b9b17d3113e58624d64d665af99b75d26614675 Related-Bug: #1488259 - Package xmltodict missing from SMlite and SMgr install The package xmltodict was being installed as part of client postinst Now brought in through Smgr postinst and SMLite postinst This will allow starting of SMgr service before Client is installed Change-Id: Ice433d0c54e9feaf860494c2f07baa7e5f3093cf Partial-Bug: #1488259 smlite changes for packaging changes -Set correct permission for provision log dir. Change-Id: I94bae0af87936e2d805b3765347128330c01f5e9 Closes-Bug: #1491183, Move debugs to a log file for provision script Change-Id: Ib21b9fb01af5479e85d0b6061375313b0480d33c Partial-Bug: #1488259 Corrected typo in earlier checkin (https://review.opencontrail.org/#/c/13498/). Change-Id: Ib76be37fdc479857454bfdc2e4b943ac0ca162e5 Closes-Bug: #1491955 - Sources.list needs to be cleaned up to prevent apt-get update errors In upgrade scenario, /etc/apt/sources.list needs to be cleaned to remove old Smgr repo entry The repo we are adding needs to be removed if present at time of install Temp files used to create local repo in Smgr sources file need to be removed if present Patch 2: Implemented review comments. Check for --all --nonsm-mon case was missing, added Patch 3: Bharat setup bug fix: exit_status wrong location for apt.conf -> TESTED Cleanup of setup repo put in main function before setup repos -> TESTED local repo in sources.list -> TESTED Monitoring set to false by default and set to true by monitoring install Change-Id: Idfde6c04543a4c721239ad106da19a472998f6f9 Closes-Bug: #1492063 - Avoiding manual steps during upgrade/purge using preinst/postrm scripts These scripts clean up the leftover /opt/contrail/contrail_server_manager folder created by installer deb The purge of installer deb doesn't autoremove this dir due to creation of Packages.gz Change-Id: If5f7786eee6a37112ca45e769174fea2dc93fb77 Closes-bug: #1494017, Modify postinstall to use the new configuration changes to support server manager lite Change-Id: Idfef75d06ac533507736cb9b86fab141ced57d50
- Loading branch information