Merge "Fix up requirements for centos7 and bionic"

This commit is contained in:
Zuul 2019-03-06 19:10:30 +00:00 committed by Gerrit Code Review
commit 427e21a7a8
4 changed files with 32 additions and 22 deletions

View File

@ -1,7 +1,10 @@
cppcheck
libevent-2.0
libevent-2.0 # dist:xenial
libevent-2.1 # dist:bionic
libevent-dev
libjson0
libjson0-dev
libjson0 # dist:xenial
libjson0-dev # dist:xenial
libjson-c3 # dist:bionic
libjson-c-dev # dist:bionic
resource-agents
facter

View File

@ -0,0 +1,7 @@
cppcheck
json-c
json-c-devel
libevent
libevent-devel
resource-agents
facter

View File

@ -462,11 +462,11 @@ function configure_maintenance {
# TODO: enable controllerconfig to do this
# add floating ip hostname in hosts
if ! cat /etc/hosts | grep controller$ > /dev/null; then
if ! grep -q 'controller$' /etc/hosts; then
echo "192.168.204.2 controller" | sudo tee -a /etc/hosts
fi
# add controller-0
if ! cat /etc/hosts | grep [0-9]$'\s'controller-0$ > /dev/null; then
if ! grep -q 'controller-0$' /etc/hosts; then
echo "192.168.204.3 controller-0" | sudo tee -a /etc/hosts
fi