diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-09-19 08:24:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-09-19 08:24:40 +0000 |
| commit | 3e59bffff3d30b7948fe8d3a189c215c2fe5946a (patch) | |
| tree | b0903866abcb4dead99f88a56ccdcdca3e1a0aff /contrib | |
| parent | 8103b90325122619d24f0036d030d6a8bdf45c4f (diff) | |
| parent | 7769c65670b767e7e8b731e3f76496791a99bcee (diff) | |
| download | kolla-ansible-3e59bffff3d30b7948fe8d3a189c215c2fe5946a.tar.gz kolla-ansible-3e59bffff3d30b7948fe8d3a189c215c2fe5946a.zip | |
Merge "Disable firewall while setup of dev env"
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/dev/vagrant/bootstrap.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/contrib/dev/vagrant/bootstrap.sh b/contrib/dev/vagrant/bootstrap.sh index 009a840f6..db521f462 100644 --- a/contrib/dev/vagrant/bootstrap.sh +++ b/contrib/dev/vagrant/bootstrap.sh @@ -55,20 +55,24 @@ function is_centos { # Install common packages and do some prepwork. function prep_work { - if [[ "$(systemctl is-enabled firewalld)" == "enabled" ]]; then - systemctl stop firewalld - systemctl disable firewalld - fi # This removes the fqdn from /etc/hosts's 127.0.0.1. This name.local will # resolve to the public IP instead of localhost. sed -i -r "s,^127\.0\.0\.1\s+.*,127\.0\.0\.1 localhost localhost.localdomain localhost4 localhost4.localdomain4," /etc/hosts if is_centos; then + if [[ "$(systemctl is-enabled firewalld)" == "enabled" ]]; then + systemctl stop firewalld + systemctl disable firewalld + fi yum -y install epel-release rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 yum -y install MySQL-python vim-enhanced python-pip python-devel gcc openssl-devel libffi-devel libxml2-devel libxslt-devel elif is_ubuntu; then + if [[ "$(systemctl is-enabled ufw)" == "enabled" ]]; then + systemctl stop ufw + systemctl disable ufw + fi apt-get update apt-get -y install python-mysqldb python-pip python-dev build-essential libssl-dev libffi-dev libxml2-dev libxslt-dev else |