From 92061511a51035ce37f080b4e17a5aa432975b6a Mon Sep 17 00:00:00 2001 From: Xicheng Chang Date: Sat, 9 Jul 2016 21:23:07 -0400 Subject: [PATCH] trim install fix bugs Change-Id: Ib844b103d4c1bb9e9b8bf70f0c5df323e0be8a2b --- install/dependency.sh | 2 +- install/install.sh | 4 ++++ .../{HA-ansible-Multinodes.yml => HA-ansible-multinodes.yml} | 0 requirements.txt | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) rename misc/adapter_changes/{HA-ansible-Multinodes.yml => HA-ansible-multinodes.yml} (100%) diff --git a/install/dependency.sh b/install/dependency.sh index 29ee1183..5deb38a6 100755 --- a/install/dependency.sh +++ b/install/dependency.sh @@ -15,7 +15,7 @@ if [ "$FULL_COMAPSS_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 - sudo yum --enablerepo=compass_install --nogpgcheck install -y rsyslog logrotate ntp iproute openssh-clients python python-devel git wget syslinux amqp dhcp bind rsync yum-utils xinetd tftp-server gcc net-snmp-utils net-snmp net-snmp-python unzip openssl openssl098e ca-certificates python-virtualenv python-setuptools python-pip bc libselinux-python libffi-devel openssl-devel + sudo yum --enablerepo=compass_install --nogpgcheck install -y rsyslog logrotate ntp iproute openssh-clients python python-devel git wget syslinux amqp httpd 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 MySQL-python python-virtualenv python-setuptools python-pip bc libselinux-python libffi-devel openssl-devel fi sudo yum --setopt=tsflags=noscripts -y remove redis # sudo yum --enablerepo=remi,remi-test install -y redis diff --git a/install/install.sh b/install/install.sh index ae6fcc3c..8224f0a5 100755 --- a/install/install.sh +++ b/install/install.sh @@ -371,4 +371,8 @@ if [ "$FULL_COMPASS_SERVER" == "false" ]; then 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/ + + sed -i 's/^CELERY_DEFAULT_QUEUE.*/CELERY_DEFAULT_QUEUE = \"'"${USER_EMAIL}"'\"/g' /etc/compass/celeryconfig + sed -i 's/^CELERY_DEFAULT_EXCHANGE.*/CELERY_DEFAULT_EXCHANGE = \"'"${USER_EMAIL}"'\"/g' /etc/compass/celeryconfig + sed -i 's/^CELERY_DEFAULT_ROUTING_KEY.*/CELERY_DEFAULT_ROUTING_KEY = \"'"${USER_EMAIL}"'\"/g' /etc/compass/celeryconfig fi diff --git a/misc/adapter_changes/HA-ansible-Multinodes.yml b/misc/adapter_changes/HA-ansible-multinodes.yml similarity index 100% rename from misc/adapter_changes/HA-ansible-Multinodes.yml rename to misc/adapter_changes/HA-ansible-multinodes.yml diff --git a/requirements.txt b/requirements.txt index 87e26a4a..d156c034 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,8 +14,8 @@ itsdangerous importlib lazypy lockfile -MySQL-python netaddr +MySQL-python paramiko PyChef python-daemon!=2.0,!=2.0.1,!=2.0.2,!=2.0.3