starlingx/metal
Code Issues Proposed changes

Fix up requirements for centos7 and bionic

Browse Source 
* Add dependencies for bionic:
  libevent-2.1
  libjson-c*

* Fix a couple of bugs setting /etc/hosts

Change-Id: Ice77cb9db8db367faa982e3113ed1c16065be896
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
This commit is contained in:
Dean Troyer 2019-02-15 10:58:11 -06:00
parent ab3f2385e8
commit a1a98d3514
4 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devstack/files/debs/stx-metal
View File

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

7
devstack/files/rpms/stx-metal Normal file
View File

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

4
devstack/lib/stx-metal
View File

@ -462,11 +462,11 @@ function configure_maintenance {
# TODO: enable controllerconfig to do this # TODO: enable controllerconfig to do this
# add floating ip hostname in hosts # 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 echo "192.168.204.2 controller" | sudo tee -a /etc/hosts
fi fi
# add controller-0 # 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 echo "192.168.204.3 controller-0" | sudo tee -a /etc/hosts
fi fi