diff --git a/install/dependency.sh b/install/dependency.sh index 5deb38a6..fecfe507 100755 --- a/install/dependency.sh +++ b/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 diff --git a/install/install.sh b/install/install.sh index 84c1fd65..8a99870d 100755 --- a/install/install.sh +++ b/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/ diff --git a/install/prepare.sh b/install/prepare.sh index 8405a14e..e8b724b8 100755 --- a/install/prepare.sh +++ b/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