diff --git a/build/deb_server_manager_setup.sh b/build/deb_server_manager_setup.sh index 5766d3486..bf4c60354 100644 --- a/build/deb_server_manager_setup.sh +++ b/build/deb_server_manager_setup.sh @@ -18,8 +18,6 @@ SM="" SMCLIENT="" SMCLIFFCLIENT="" HOSTIP="" -SMMON="" -NOSMMON="" WEBUI="" NOWEBUI="" WEBCORE="" @@ -39,12 +37,10 @@ function usage() echo "-h --help" echo "--smlite" echo "--nowebui" - echo "--nosm-mon" echo "--sm" echo "--sm-client" echo "--sm-cliff-client" echo "--webui" - echo "--sm-mon" echo "--hostip=" echo "--cert-name=" echo "--all" @@ -194,7 +190,6 @@ while [ "$1" != "" ]; do WEBCORE="contrail-web-core" SMCLIENT="contrail-server-manager-client" SMCLIFFCLIENT="contrail-server-manager-cliff-client" - SMMON="contrail-server-manager-monitoring" ;; --smlite) SMLITE="smlite" @@ -202,9 +197,6 @@ while [ "$1" != "" ]; do --nowebui) NOWEBUI="nowebui" ;; - --nosm-mon) - NOSMMON="nosm-mon" - ;; --sm) SM="contrail-server-manager" ;; @@ -212,9 +204,6 @@ while [ "$1" != "" ]; do WEBUI="contrail-web-server-manager" WEBCORE="contrail-web-core" ;; - --sm-mon) - SMMON="contrail-server-manager-monitoring" - ;; --sm-client) SMCLIENT="contrail-server-manager-client" ;; @@ -311,6 +300,7 @@ if [ "$SM" != "" ]; then RESTART_SERVER_MANAGER="1" if [ "$SMLITE" != "" ]; then echo "$space$arrow$install_str Server Manager Lite" + dpkg -P --force-all contrail-server-manager-monitoring >> $log_file 2>&1 apt-get -y install contrail-server-manager-lite >> $log_file 2>&1 apt-get -y install -f >> $log_file 2>&1 else @@ -325,6 +315,7 @@ if [ "$SM" != "" ]; then fi echo "$space$arrow$install_str Server Manager" apt-get -y install cobbler="2.6.3-1" >> $log_file 2>&1 # TODO : Remove after local repo pinning + dpkg -P --force-all contrail-server-manager-monitoring >> $log_file 2>&1 apt-get -y install contrail-server-manager >> $log_file 2>&1 apt-get -y install -f >> $log_file 2>&1 # Stopping webui service that uses old name @@ -378,14 +369,6 @@ if [ "$WEBUI" != "" ] && [ "$NOWEBUI" == "" ]; then echo "$arrow Completed Installing Web Server Manager" fi -if [ "$SMMON" != "" ] && [ "$NOSMMON" == "" ]; then - echo "$arrow Server Manager Monitoring" - echo "$space$arrow$install_str Server Manager Monitoring" - apt-get -y install contrail-server-manager-monitoring >> $log_file 2>&1 - apt-get -y install -f >> $log_file 2>&1 - echo "$arrow Completed Installing Server Manager Monitoring" -fi - if [ "x$RESTART_SERVER_MANAGER" == "x1" ]; then if [ "$SMLITE" != "" ]; then echo "$space$space$arrow Starting Server Manager Lite Service" diff --git a/common/debian/contrail-server-manager-lite/debian/control b/common/debian/contrail-server-manager-lite/debian/control index aa3c6cb83..e612ee82f 100755 --- a/common/debian/contrail-server-manager-lite/debian/control +++ b/common/debian/contrail-server-manager-lite/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 8) Package: contrail-server-manager-lite Architecture: all Maintainer: tsurendra -Depends: python, apache2, sqlite, puppetmaster-passenger (=3.7.3-1puppetlabs1), puppetmaster-common (=3.7.3-1puppetlabs1), xinetd, python-pip, python-gevent, ntp,autoconf, gcc, tftp, sendmail, dpkg-dev, syslinux, ipmitool, createrepo, libapache2-mod-wsgi, python-urlgrabber, python-django, selinux-utils, python-simplejson, python-dev, fence-agents, python-requests, reprepro, python-netaddr, python-yaml, libnss3-1d, python-paramiko, python-xmltodict, python-pycurl, python-crypto +Depends: python, apache2, sqlite, puppetmaster-passenger (=3.7.3-1puppetlabs1), puppetmaster-common (=3.7.3-1puppetlabs1), xinetd, python-pip, python-gevent, ntp,autoconf, gcc, tftp, sendmail, dpkg-dev, syslinux, ipmitool, createrepo, libapache2-mod-wsgi, python-urlgrabber, python-django, selinux-utils, python-simplejson, python-dev, fence-agents, python-requests, reprepro, python-netaddr, python-yaml, libnss3-1d, python-paramiko, python-xmltodict, python-pycurl, python-crypto, python-contrail Section: contrail-server-manager-lite Priority: extra Description: Contrail Server Manager - Server Package, without cobbler, only provisioning supported package. diff --git a/common/debian/contrail-server-manager-lite/debian/postinst b/common/debian/contrail-server-manager-lite/debian/postinst index 81e7ba505..16619d5dc 100755 --- a/common/debian/contrail-server-manager-lite/debian/postinst +++ b/common/debian/contrail-server-manager-lite/debian/postinst @@ -45,6 +45,7 @@ update-rc.d contrail-server-manager defaults # Set IP address in server manager configuration file. sed -i "s/__\$IPADDRESS__/$HOST_IP/g" /opt/contrail/server_manager/sm-config.ini +sed -i "s/127.0.0.1/$HOST_IP/g" /opt/contrail/server_manager/sm-config.ini # Set IP Address in smgr_dhcp_event.py DHCP hook. sed -i "s/__\$IPADDRESS__/$HOST_IP/g" /opt/contrail/server_manager/smgr_dhcp_event.py diff --git a/common/debian/contrail-server-manager-lite/debian/rules b/common/debian/contrail-server-manager-lite/debian/rules index cb3f42687..6c652699e 100755 --- a/common/debian/contrail-server-manager-lite/debian/rules +++ b/common/debian/contrail-server-manager-lite/debian/rules @@ -94,24 +94,8 @@ override_dh_auto_install: install -p -m 755 $(src_path)/reprepro/conf/override $(build_root)/opt/contrail/server_manager/reprepro/conf/override install -p -m 755 $(src_path)/reprepro/dpdk_depends_conf/distributions $(build_root)/opt/contrail/server_manager/reprepro/dpdk_depends_conf/distributions install -p -m 755 $(src_path)/reprepro/dpdk_depends_conf/override $(build_root)/opt/contrail/server_manager/reprepro/dpdk_depends_conf/override - cp -r $(src_path)/server_mgr_main.py $(build_root)/opt/contrail/server_manager/ - cp -r $(src_path)/server_mgr_db.py $(build_root)/opt/contrail/server_manager/ - cp -r $(src_path)/server_mgr_utils.py $(build_root)/opt/contrail/server_manager/ - cp -r $(src_path)/server_mgr_cobbler.py $(build_root)/opt/contrail/server_manager/ - cp -r $(src_path)/server_mgr_status.py $(build_root)/opt/contrail/server_manager/ - cp -r $(src_path)/server_mgr_puppet.py $(build_root)/opt/contrail/server_manager/ - cp -r $(src_path)/server_mgr_exception.py $(build_root)/opt/contrail/server_manager/ - cp -r $(src_path)/server_mgr_logger.py $(build_root)/opt/contrail/server_manager/ - cp -r $(src_path)/server_mgr_err.py $(build_root)/opt/contrail/server_manager/ - cp -r $(src_path)/smgr_dhcp_event.py $(build_root)/opt/contrail/server_manager/ - cp -r $(src_path)/contrail_defaults.py $(build_root)/opt/contrail/server_manager/ - cp -r $(src_path)/server_mgr_defaults.py $(build_root)/opt/contrail/server_manager/ + cp -r $(src_path)/*.py $(build_root)/opt/contrail/server_manager/ cp -r $(src_path)/vmware/esxi_contrailvm.py $(build_root)/opt/contrail/server_manager/ - cp -r $(src_path)/server_mgr_mon_base_plugin.py $(build_root)/opt/contrail/server_manager/ - cp -r $(src_path)/server_mgr_ssh_client.py $(build_root)/opt/contrail/server_manager/ - cp -r $(src_path)/server_mgr_validations.py $(build_root)/opt/contrail/server_manager/ - cp -r $(src_path)/server_mgr_certs.py $(build_root)/opt/contrail/server_manager/ - cp -r $(src_path)/server_mgr_cert_utils.py $(build_root)/opt/contrail/server_manager/ cp -r $(src_path)/role_sequence.json $(build_root)/etc/contrail_smgr/ cp -r $(src_path)/contrail-defaults.yaml $(build_root)/etc/contrail_smgr/ cp -r $(src_path)/create_vm.py $(build_root)/opt/contrail/server_manager/ diff --git a/common/debian/contrail-server-manager/debian/control b/common/debian/contrail-server-manager/debian/control index 7fcbc850f..fb7770b2d 100644 --- a/common/debian/contrail-server-manager/debian/control +++ b/common/debian/contrail-server-manager/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 8) Package: contrail-server-manager Architecture: all Maintainer: tsurendra -Depends: python , apache2, sqlite, cobbler (=2.6.3-1), puppetmaster-passenger (=3.7.3-1puppetlabs1), puppetmaster-common (=3.7.3-1puppetlabs1), xinetd, python-pip, python-gevent, dhcp3-server, ntp,autoconf, gcc, bind9, tftp, sendmail, dpkg-dev, syslinux, ipmitool, createrepo, libapache2-mod-wsgi, tftpd-hpa, python-urlgrabber, python-django, selinux-utils, python-simplejson, python-dev, fence-agents, python-requests, reprepro, python-netaddr +Depends: python , apache2, sqlite, cobbler (=2.6.3-1), puppetmaster-passenger (=3.7.3-1puppetlabs1), puppetmaster-common (=3.7.3-1puppetlabs1), xinetd, python-pip, python-gevent, dhcp3-server, ntp,autoconf, gcc, bind9, tftp, sendmail, dpkg-dev, syslinux, ipmitool, createrepo, libapache2-mod-wsgi, tftpd-hpa, python-urlgrabber, python-django, selinux-utils, python-simplejson, python-dev, fence-agents, python-requests, reprepro, python-netaddr, python-contrail Section: contrail-server-manager Priority: extra Description: Contrail Server Manager - Server Package diff --git a/common/debian/contrail-server-manager/debian/postinst b/common/debian/contrail-server-manager/debian/postinst index 84a0f8576..8ad8e3af8 100644 --- a/common/debian/contrail-server-manager/debian/postinst +++ b/common/debian/contrail-server-manager/debian/postinst @@ -135,6 +135,9 @@ a2enmod mpm_worker update-rc.d contrail-server-manager defaults # Set IP address in server manager configuration file. sed -i "s/__\$IPADDRESS__/$HOST_IP/g" /opt/contrail/server_manager/sm-config.ini +sed -i "s/127.0.0.1/$HOST_IP/g" /opt/contrail/server_manager/sm-config.ini +# Set monitoring true as default +sed -i "s/monitoring * = .*/monitoring = true/g" # Set IP Address in smgr_dhcp_event.py DHCP hook. sed -i "s/__\$IPADDRESS__/$HOST_IP/g" /opt/contrail/server_manager/smgr_dhcp_event.py sed -i "s/cobbler_username = cobbler/cobbler_username = testing/g" /opt/contrail/server_manager/sm-config.ini