x/compass-core
Code Issues Proposed changes

remove some of the replacement

Browse Source 
Change-Id: I465b0229c492f0c874d4014ccb4be1f873939d29
This commit is contained in:
Xicheng Chang 2016-07-11 23:52:44 -04:00
parent 62d20d75d5
commit 6b13fb7a39
3 changed files with 10 additions and 10 deletions

4
install/dependency.sh

@ -11,7 +11,7 @@ if [ "$tempest" == "true" ]; then
fi
fi
if [ "$FULL_COMAPSS_SERVER" == "true" ]; then
if [ "$FULL_COMPASS_SERVER" == "true" ]; then
sudo yum --enablerepo=compass_install install -y $MYSQL
sudo yum --enablerepo=compass_install --nogpgcheck install -y rsyslog logrotate ntp iproute openssh-clients python python-devel git wget syslinux amqp rabbitmq-server mod_wsgi httpd squid dhcp bind rsync yum-utils xinetd tftp-server gcc net-snmp-utils net-snmp net-snmp-python unzip openssl openssl098e ca-certificates mysql-devel mysql-server mysql MySQL-python python-virtualenv python-setuptools python-pip bc libselinux-python libffi-devel openssl-devel
else
@ -61,7 +61,7 @@ sudo systemctl enable sshd.service
sudo systemctl enable rsyslog.service
sudo systemctl enable ntpd.service
sudo systemctl enable redis.service
if [ "$FULL_COMAPSS_SERVER" == "true" ]; then
if [ "$FULL_COMPASS_SERVER" == "true" ]; then
sudo systemctl enable mysqld.service
sudo systemctl enable rabbitmq-server.service
fi

14
install/install.sh

@ -343,7 +343,7 @@ echo "Install the Package Installer Tool"
# source ${COMPASSDIR}/install/chef.sh || exit $?
source ${COMPASSDIR}/install/ansible.sh || exit $?
if [ "$FULL_COMAPSS_SERVER" == "true"]; then
if [ "$FULL_COMPASS_SERVER" == "true"]; then
echo "Download and install Compass Web"
source ${COMPASSDIR}/install/compass_web.sh || exit $?
fi
@ -365,12 +365,12 @@ if [ "$FULL_COMPASS_SERVER" == "false" ]; then
machine_list_conf="${machine_list_conf}\n ] } ]"
sudo echo -e ${machine_list_conf} > /etc/compass/machine_list/machine_list.conf
rm -rf /var/ansible/roles/keystone/vars/Debian.yml 2>/dev/null
cp ${COMPASSDIR}/misc/adapter_changes/Debian.yml /var/ansible/roles/keystone/vars/
rm -rf /var/ansible/roles/keystone/tasks/keystone_install.yml 2>/dev/null
cp ${COMPASSDIR}/misc/adapter_changes/keystone_install.yml /var/ansible/roles/keystone/tasks/
rm -rf /var/ansible/openstack_mitaka/HA-ansible-multinodes.yml 2>/dev/null
cp ${COMPASSDIR}/misc/adapter_changes/HA-ansible-multinodes.yml /var/ansible/openstack_mitaka/
# rm -rf /var/ansible/roles/keystone/vars/Debian.yml 2>/dev/null
# cp ${COMPASSDIR}/misc/adapter_changes/Debian.yml /var/ansible/roles/keystone/vars/
# rm -rf /var/ansible/roles/keystone/tasks/keystone_install.yml 2>/dev/null
# cp ${COMPASSDIR}/misc/adapter_changes/keystone_install.yml /var/ansible/roles/keystone/tasks/
# rm -rf /var/ansible/openstack_mitaka/HA-ansible-multinodes.yml 2>/dev/null
# cp ${COMPASSDIR}/misc/adapter_changes/HA-ansible-multinodes.yml /var/ansible/openstack_mitaka/
rm -rf /var/lib/cobbler/snippets/preseed_post_anamon 2>/dev/null
cp ${COMPASSDIR}/misc/adapter_changes/preseed_post_anamon /var/lib/cobbler/snippets/

2
install/prepare.sh

@ -104,7 +104,7 @@ else
fi
#update mysqld
if [ "$FULL_COMAPSS_SERVER" == "true"]; then
if [ "$FULL_COMPASS_SERVER" == "true"]; then
echo "update mysqld"
mkdir -p /var/log/mysql
chmod -R 777 /var/log/mysql