From fc8d71631644861a61481948ef0e1cdfe951bcb3 Mon Sep 17 00:00:00 2001
From: "Swapnil Kulkarni (coolsvap)" <me@coolsvap.net>
Date: Thu, 21 Apr 2016 17:22:30 +0530
Subject: [PATCH] Update remaining files for formatting
Change-Id: Ie9fc941bb48edf86b00fc1f2dba0b83b675a5a1c
Partial-Bug:#1569417
---
dev/heat/kollanode.yaml | 4 ++--
dev/vagrant/bootstrap.sh | 10 +++++-----
doc/quickstart.rst | 2 +-
tools/setup_RedHat.sh | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dev/heat/kollanode.yaml b/dev/heat/kollanode.yaml
index b2dab39215..04c958f731 100644
--- a/dev/heat/kollanode.yaml
+++ b/dev/heat/kollanode.yaml
@@ -184,10 +184,10 @@ resources:
systemctl start ntpd
# Install mariadb-client
- yum install -y mariadb
+ yum -y install mariadb
# Install OpenStack Clients
- yum install -y python-keystoneclient python-glanceclient \
+ yum -y install python-keystoneclient python-glanceclient \
python-novaclient python-cinderclient \
python-neutronclient python-heatclient
diff --git a/dev/vagrant/bootstrap.sh b/dev/vagrant/bootstrap.sh
index e7a50e09d9..ace58ecba1 100644
--- a/dev/vagrant/bootstrap.sh
+++ b/dev/vagrant/bootstrap.sh
@@ -32,7 +32,7 @@ function _ensure_lsb_release {
if [[ -x $(which apt-get 2>/dev/null) ]]; then
sudo apt-get install -y lsb-release
elif [[ -x $(which yum 2>/dev/null) ]]; then
- sudo yum install -y redhat-lsb-core
+ sudo yum -y install redhat-lsb-core
fi
}
@@ -65,9 +65,9 @@ function prep_work {
sed -i -r "s/^(127\.0\.0\.1\s+)(.*) `hostname` (.+)/\1 \3/" /etc/hosts
if is_centos; then
- yum install -y epel-release
+ yum -y install epel-release
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
- yum install -y MySQL-python vim-enhanced python-pip python-devel gcc openssl-devel libffi-devel libxml2-devel libxslt-devel
+ yum -y install MySQL-python vim-enhanced python-pip python-devel gcc openssl-devel libffi-devel libxml2-devel libxslt-devel
elif is_ubuntu; then
apt-get update
apt-get install -y python-mysqldb python-pip python-dev build-essential libssl-dev libffi-dev libxml2-dev libxslt-dev
@@ -105,7 +105,7 @@ EOF
# Also upgrade device-mapper here because of:
# https://github.com/docker/docker/issues/12108
# Upgrade lvm2 to get device-mapper installed
- yum install -y docker-engine lvm2 device-mapper
+ yum -y install docker-engine lvm2 device-mapper
# Despite it shipping with /etc/sysconfig/docker, Docker is not configured to
# load it from it's service file.
@@ -144,7 +144,7 @@ function configure_kolla {
# Configure the operator node and install some additional packages.
function configure_operator {
if is_centos; then
- yum install -y git mariadb
+ yum -y install git mariadb
elif is_ubuntu; then
apt-get install -y git mariadb-client selinux-utils
else
diff --git a/doc/quickstart.rst b/doc/quickstart.rst
index bd799c8e20..e236afe0a9 100644
--- a/doc/quickstart.rst
+++ b/doc/quickstart.rst
@@ -156,7 +156,7 @@ following requirements are needed to build the client code:
apt-get install -y python-dev libffi-dev libssl-dev gcc git
# CentOS 7
- yum install -y python-devel libffi-devel openssl-devel gcc git
+ yum -y install python-devel libffi-devel openssl-devel gcc git
To install these clients use:
diff --git a/tools/setup_RedHat.sh b/tools/setup_RedHat.sh
index cdc8254a6e..ce5a93838c 100755
--- a/tools/setup_RedHat.sh
+++ b/tools/setup_RedHat.sh
@@ -40,7 +40,7 @@ gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg
EOF
-sudo yum install -y libffi-devel openssl-devel docker-engine btrfs-progs
+sudo yum -y install libffi-devel openssl-devel docker-engine btrfs-progs
setup_disk