Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
port smlite related changes from R2.22-dev to R2.20
Closes-Bug: 1513743 This is a combination of 21 commits. ------------------------------------------------------------------- The first commit's message is: 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 (cherry picked from commit 2d45ba3) This is the 2nd commit message: ------------------------------------------------------------------- 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 (cherry picked from commit 4a7fbec) This is the 3rd commit message: ------------------------------------------------------------------- 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 (cherry picked from commit 2ff50b6) This is the 4th commit message: ------------------------------------------------------------------- updates for sm-lite packages - use interface_setup.py from client package Closes-Bug: 1490779 Change-Id: I6b9b17d3113e58624d64d665af99b75d26614675 (cherry picked from commit 89d7c93) This is the 5th commit message: ------------------------------------------------------------------- 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 (cherry picked from commit cc79d09) This is the 6th commit message: ------------------------------------------------------------------- Partial-Bug: #1488259 smlite changes for packaging changes -Set correct permission for provision log dir. Change-Id: I94bae0af87936e2d805b3765347128330c01f5e9 (cherry picked from commit 16dfcb3) This is the 7th commit message: ------------------------------------------------------------------- Closes-Bug: #1491183, Move debugs to a log file for provision script Change-Id: Ib21b9fb01af5479e85d0b6061375313b0480d33c (cherry picked from commit 5eea559) This is the 8th commit message: ------------------------------------------------------------------- Partial-Bug: #1488259 Corrected typo in earlier checkin (https://review.opencontrail.org/#/c/13498/). Change-Id: Ib76be37fdc479857454bfdc2e4b943ac0ca162e5 (cherry picked from commit 2868200) This is the 9th commit message: ------------------------------------------------------------------- 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 (cherry picked from commit 8708776) This is the 10th commit message: ------------------------------------------------------------------- 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 (cherry picked from commit 2c3f954) This is the 11th commit message: ------------------------------------------------------------------- Closes-bug: #1494017, Modify postinstall to use the new configuration changes to support server manager lite Change-Id: Idfef75d06ac533507736cb9b86fab141ced57d50 (cherry picked from commit b87a362) This is the 12th commit message: ------------------------------------------------------------------- Closes-Bug: #1495739 - Puppet config should come in with installer for cert gen Without the correct conf, the new certs generated for puppet master will not have DNS alt names as puppet This will cause provisioning to fail for SM as well as SM LITE Change-Id: I49f3c92e8d9e569ef417f56d0b72573d159564f7 (cherry picked from commit c758945) This is the 13th commit message: ------------------------------------------------------------------- Related-Bug: #1488259 - SM Lite needs to replace apache mpm_event with mpm_worker Puppetmaster Passenger brings in mpm_event but SM Lite needs mpm_worker This change is already present in SMgr Change-Id: Ifce49d6ed39575d63660e4ab628883bb33239c01 (cherry picked from commit f936303) This is the 14th commit message: ------------------------------------------------------------------- Closes-Bug: #1497407 - Server Manager Upgrade fix to bring in dirs Dir /opt/contrail/contrail_server_manager/ is deleted in preinst It should be brought in by rules file Patch 2: Moved post rm removal of files to pre rm (Incorrect order) In purge case: pre rm removes files In upgrade case: pre rm removes files In install case: pre install removes files Change-Id: I117787a0fc687abecbfd6df47faed7cec8a73c53 (cherry picked from commit 606714d) This is the 15th commit message: ------------------------------------------------------------------- Related-Bug: #1463208 - Moving Server Manager Client CLI to Cliff Framework This check-in: - Added packaging scripts - Packaging pip installable .tar.gz package - Packaging additional wrapper debian for above .tar.gz Patch 2: - Added scripts to package with server-manager-installer package - Debian can be installed with or without installer - Setup script changes to include cliff client Change-Id: I275416207e090f420e1edfaafd95313b31b50899 (cherry picked from commit 0b570f0) This is the 16th commit message: ------------------------------------------------------------------- Closes-Bug: #1503143 - Adding static route support to SM Lite provision New script called from preconfig.py: https://github.com/Juniper/contrail-provisioning/blob/master/contrail_provisioning/common/staticroute_setup.py This script added to SM client package in this check-in Change-Id: Ib8bbe3c85568ce8d209c5b6269db99e56120b363 (cherry picked from commit 3d05521) This is the 17th commit message: ------------------------------------------------------------------- Closed-Bug: #1503963, server manager lite options for installing webui and monitoring functions Change-Id: Ia78b33953784e65807a4ed68d7004f928bc25c2c (cherry picked from commit 2326328) This is the 18th commit message: ------------------------------------------------------------------- Closes-Bug: #1503868, SM-Lite should have an option to take the domain name Change-Id: Idf589bbf1a32b98b8fb208a83eb575aae912c8c3 (cherry picked from commit a9b5359) This is the 19th commit message: ------------------------------------------------------------------- Closes-Bug: #1511549, server manager setup is failing, if host_ip option is specified Change-Id: I1bb4ce850b8a9bdc85b8a0cbea4c234494766099 (cherry picked from commit 95f32b7) This is the 20th commit message: ------------------------------------------------------------------- Bring python-xmltodict in ubuntu1404/icehosue server-manager package Change-Id: Iff52db8c9959a99964a19b8370680376a80d32d2 Closes-Bug: 1505903 (cherry picked from commit 30a553d) This is the 21st commit message: ------------------------------------------------------------------- Related-Bug: #1463208 - Adding Cliff Client to Icehouse Builds also Missing package config for 14.04 icehouse to add Cliff Client Package to Smgr Installer Change-Id: I4b74f4dcb62e7bfb952a23792b88012fe2495adf (cherry picked from commit 945005e)
- Loading branch information
1 parent
c6f22ea
commit 7d8d435