sipwise
/
ngcpcfg
mirror of https://github.com/sipwise/ngcpcfg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

TT#139151 Switch to use ngcp_hostname

Browse Source 
Use ngcp-hostname instead of using real hostname.

Change-Id: Ia818f50e300e0f66762370eab331c7b7f1288d26
mr10.1
Mykola Malkov 4 years ago
parent b27fce1e36
commit 589dedb674
13 changed files with 41 additions and 51 deletions
Show Stats Download Patch File Download Diff File

32
docs/ngcpcfg.txt
Unescape View File

@ -55,8 +55,8 @@ Main configuration files
* _/etc/ngcp-config/config.yml_: central configuration file, to be configured with
$EDITOR, webfrontend,...
* _/etc/ngcp-config/config.$HOSTNAME.yml_: host specific configuration file,
depending on the hostname (:= $HOSTNAME) of the system.
* _/etc/ngcp-config/config.$NGCP_HOSTNAME.yml_: host specific configuration file,
depending on the ngcp_hostname (:= $NGCP_HOSTNAME) of the system.
* _/etc/ngcp-config/config.$PAIRNAME.yml_: pair specific configuration file,
depending on the pairname (:= $PAIRNAME) of the system (for example _sp_ on
@ -94,7 +94,7 @@ Files with suffix '.cfg' inside this directory are sourced after
[IMPORTANT]
Configuration file priority: constants.yml takes precedence over
all files in _/etc/ngcp-config/config.d/_, over config.local.yml,
over config.$HOSTNAME.yml, over config.$PAIRNAME.yml,
over config.$NGCP_HOSTNAME.yml, over config.$PAIRNAME.yml,
over config.$HA_NODE.yml, over config.yml.
High Availability specific configuration files
@ -132,10 +132,10 @@ useful if there are multiple pairs available but only a specific pair of them
should include some specific configuration.
Note: This feature is available in High Availability setups only.
* _/etc/ngcp-config/templates/etc/foobar/baz.tt2.$HOSTNAME_: hostname specific
* _/etc/ngcp-config/templates/etc/foobar/baz.tt2.$NGCP_HOSTNAME_: ngcp_hostname specific
template file. While $HA_NODE is usually bound to _sp1_ for the first node and
_sp2_ via /etc/ngcp_ha_node it's possible to use host specific template file by
referring to its hostname ($HOSTNAME is determined via (hostname(1)).
referring to its ngcp_hostname ($NGCP_HOSTNAME is determined via ngcp-hostname).
Note: This feature is available in High Availability setups only.
* _/etc/ngcp-config/templates/etc/foobar/baz.customtt.tt2_: system specific
@ -155,19 +155,19 @@ _/etc/ngcp-config/templates/etc/foobar/baz.tt2.$PAIRNAME_ but it's guaranteed
that the file won't be part of any Debian package mechanism. Note: This feature is
available in High Availability setups only.
* _/etc/ngcp-config/templates/etc/foobar/baz.customtt.tt2.$HOSTNAME_:
* _/etc/ngcp-config/templates/etc/foobar/baz.customtt.tt2.$NGCP_HOSTNAME_:
configuration file similar to
_/etc/ngcp-config/templates/etc/foobar/baz.tt2.$HOSTNAME_ but it's guaranteed
_/etc/ngcp-config/templates/etc/foobar/baz.tt2.$NGCP_HOSTNAME_ but it's guaranteed
that the file won't be part of any Debian package mechanism. Note: This feature is
available in High Availability setups only.
[IMPORTANT]
Configuration file precedence (highest to lowest):
*.customtt.tt2.$HOSTNAME
*.customtt.tt2.$NGCP_HOSTNAME
*.customtt.tt2.$PAIRNAME
*.customtt.tt2.$HA_NODE
*.customtt.tt2,
*.tt2.$HOSTNAME
*.tt2.$NGCP_HOSTNAME
*.tt2.$PAIRNAME
*.tt2.$HA_NODE
*.tt2.
@ -193,7 +193,7 @@ availability of the necessary local changes on every configuration apply.
[IMPORTANT]
The patch to be applied to the corresponding tt2 template file is selected in
the following order (highest to lowest):
*.patchtt.tt2.$HOSTNAME
*.patchtt.tt2.$NGCP_HOSTNAME
*.patchtt.tt2.$PAIRNAME
*.patchtt.tt2.$HA_NODE
*.patchtt.tt2
@ -231,7 +231,7 @@ Syntax and layout of configuration files
* _/etc/ngcp-config/ngcpcfg.cfg_: plain shell syntax style "key=value" entries
* _/etc/ngcp-config/systems.cfg_: one hostname or IP address per line
* _/etc/ngcp-config/systems.cfg_: one ngcp_hostname or IP address per line
* _central yml files_ (*.yml): YAML configuration syntax (see http://yaml.org/)
@ -475,7 +475,7 @@ specified, then only the _build_ operation will be executed). To skip building
any configuration files at all the '--nobuild' option can be specified (implying
to also skip the _apply_ operation). If the '--shared-only' option is set then
the any pending commits will be pushed only to the shared repository only, any
foreign hosts will be skipped then. If hostname(s) or IP address(es) is given
foreign hosts will be skipped then. If ngcp_hostname(s) or IP address(es) is given
as argument then the changes will be pushed to the shared repository and to the
given hosts only. If no host has been specified then the hosts specified in
_/etc/ngcp-config/systems.cfg_ are used. The magic word 'all' can be used as a 'host'
@ -501,7 +501,7 @@ service restart. In this case you should NOT push to the peer nodes simultaneous
as this can cause heartbeat service restart on both sp1 and sp2 nodes simultaneously).
The 'host' can be defined as 'sp1' or 'sp2' which is a ngcpcfg filter where to push/apply.
The actions will be performed if the HA node hostname is 'sp1' or 'sp2' ignoring the HA active state.
The actions will be performed if the HA node ngcp_hostname is 'sp1' or 'sp2' ignoring the HA active state.
It is safe to push to all sp1 nodes at once, as the peer (sp2 node) will be activated
in case the current node does a heartbeat restart.
@ -510,7 +510,7 @@ If the special host 'all' is used the push will be performed in parallel in two
- the second step pushes and applies changes to all sp2 nodes (ignoring the HA state).
Note: the second step will NOT be executed if any issue is detected on the first step.
If one or multiple hostnames or IP addresses are given as arguments then the
If one or multiple ngcp_hostnames or IP addresses are given as arguments then the
changes will be only pushed to the shared repository and the actions performed
only on the given hosts.
@ -657,9 +657,9 @@ Error handling - what does this error message mean?
Error message:
Error: Failed hosts: hostname (down)
Error: Failed hosts: ngcp_hostname (down)
Background: The system "hostname" is not reachable via ICMP, which means it's
Background: The system "ngcp_hostname" is not reachable via ICMP, which means it's
not reachable for the ngcpcfg system.
How to fix: Make sure the system is up and running and reachable via ssh from

2
etc/ngcp-config/ngcpcfg.cfg
Unescape View File

@ -12,7 +12,7 @@ NGCPCTL_MAIN="${NGCPCTL_BASE}/ngcp-config"
NGCPCTL_CONFIG="${NGCPCTL_MAIN}/config.yml"
HA_CONFIG="${HA_FILE:+${NGCPCTL_MAIN}/config${HA_FILE}.yml}"
PAIR_CONFIG="${PAIR_FILE:+${NGCPCTL_MAIN}/config${PAIR_FILE}.yml}"
HOST_CONFIG="${NGCPCTL_MAIN}/config.$(hostname).yml"
HOST_CONFIG="${NGCPCTL_MAIN}/config.$(ngcp-hostname).yml"
LOCAL_CONFIG="${NGCPCTL_MAIN}/config.local.yml"
CONSTANTS_CONFIG="${NGCPCTL_MAIN}/constants.yml"
NETWORK_CONFIG="${NGCPCTL_MAIN}/network.yml"

2
functions/init
Unescape View File

@ -65,7 +65,7 @@ fi
## environment variables {{{
export PN="ngcpcfg"
export HNAME
HNAME="$(hostname)"
HNAME="$(ngcp-hostname)"
export NNAME
NNAME="$(ngcp-nodename)"

6
lib/NGCP/Template/Object.pm
Unescape View File

@ -47,11 +47,7 @@ sub get_hostname
{
my $self = shift;
# Do not trust hostname(1) as this might differ from the hostname of
# the system which runs the installer, instead rely on /etc/hostname
open my $hh, '<', '/etc/hostname' or die "Error opening /etc/hostname";
my $hostname = <$hh>;
close $hh;
my $hostname = qx(ngcp-hostname);
chomp $hostname;
die "Fatal error retrieving hostname [$hostname]" unless length $hostname;

4
lib/get_firstname
Unescape View File

@ -1,9 +1,9 @@
[%
# vi: ft=tt2
# Returns the (alphabetically) first hostname of a node pair for a given host.
# Returns the (alphabetically) first ngcp_hostname of a node pair for a given host.
#
# @param argv.host The hostname to get the first name for.
# @param argv.host The ngcp_hostname to get the first name for.
# @return out The alphabetically first name.
out = ngcp.get_firstname(argv.host);

17
sbin/ngcp-network
Unescape View File

@ -16,18 +16,14 @@ use Pod::Usage;
use Regexp::IPv6 qw($IPv6_re);
use Socket;
use Storable qw(dclone);
use Sys::Hostname;
use YAML::XS;
our $VERSION = 'UNRELEASED';
# defaults / option handling {{{
open my $hh, '<', '/etc/hostname'
or croak "Error opening /etc/hostname: $ERRNO";
my $host = <$hh>;
close $hh or croak 'Error closing file handling for /etc/hostname';
my $host = qx(ngcp-hostname);
chomp $host;
length $host or croak "Fatal error retrieving hostname [$host]";
length $host or croak "Fatal error retrieving ngcp_hostname [$host]";
my $advertised_ip;
my $bond_miimon;
@ -968,14 +964,9 @@ The specified command line option is not support.
The specified input file doesn't exist or can't be read.
=head2 Error opening /etc/hostname: ...
=head2 Fatal error retrieving ngcp_hostname [...]
The file /etc/hostname couldn't be read, either because the file doesn't exist
or having wrong file permissions.
=head2 Fatal error retrieving hostname [...]
No valid hostname could not be retrieved from /etc/hostname.
No valid ngcp_hostname could be retrieved from ngcp-hostname.
=head2 Specified IP ... is not a valid IPv4 address

5
sbin/ngcp-sync-grants
Unescape View File

@ -99,11 +99,8 @@ sub log_warn { logger(shift, 2); }
sub get_hostname {
open(my $fh, "<", "/etc/hostname")
or die "Cannot open /etc/hostname: $ERRNO";
my $hostname = <$fh>;
my $hostname = qx(ngcp-hostname);
chomp $hostname;
close $fh;
return $hostname;
}

13
scripts/commit
Unescape View File

@ -11,6 +11,7 @@ FUNCTIONS="${FUNCTIONS:-/usr/share/ngcp-ngcpcfg/functions/}"
HELPER="${HELPER:-/usr/share/ngcp-ngcpcfg/helper/}"
HOOKS="${HOOKS:-/usr/share/ngcp-ngcpcfg/hooks/}"
SCRIPTS="${SCRIPTS:-/usr/share/ngcp-ngcpcfg/scripts/}"
NGCP_HOSTNAME="$(ngcp-hostname)"
if ! [ -r "${FUNCTIONS}"/main ] ; then
printf "Error: %s/main could not be read. Exiting.\n" "${FUNCTIONS}">&2
@ -53,17 +54,17 @@ if ! git config user.name >/dev/null ; then
git config user.name "ngcp-config"
fi
if ! git config user.email >/dev/null ; then
log_debug "git config user.email \"root@\$(hostname)\""
git config user.email "root@$(hostname)"
log_debug "git config user.email \"root@\${NGCP_HOSTNAME}\""
git config user.email "root@${NGCP_HOSTNAME}"
fi
if ! git config --global user.name >/dev/null ; then
log_debug "git config --global user.name \"git user on \$(hostname)\""
git config --global user.name "git user on $(hostname)"
log_debug "git config --global user.name \"git user on \${NGCP_HOSTNAME}\""
git config --global user.name "git user on ${NGCP_HOSTNAME}"
fi
if ! git config --global user.email >/dev/null ; then
log_debug "git config --global user.email \"root@\$(hostname)\""
git config --global user.email "root@$(hostname)"
log_debug "git config --global user.email \"root@\${NGCP_HOSTNAME}\""
git config --global user.email "root@${NGCP_HOSTNAME}"
fi
# commit message

3
t/fixtures/bin/ngcp-hostname
Unescape View File

@ -0,0 +1,3 @@
#!/bin/sh
echo sp1

2
t/fixtures/ngcpcfg.cfg
Unescape View File

@ -2,7 +2,7 @@
[ -n "${NGCPCTL_BASE:-}" ] || NGCPCTL_BASE="$(pwd)/"
[ -n "${NGCPCTL_MAIN:-}" ] || NGCPCTL_MAIN="${NGCPCTL_BASE}/fixtures/repos/"
[ -n "${NGCPCTL_CONFIG:-}" ] || NGCPCTL_CONFIG="${NGCPCTL_MAIN}/config.yml"
[ -n "${HOST_CONFIG:-}" ] || HOST_CONFIG="${NGCPCTL_MAIN}/config.$(hostname).yml"
[ -n "${HOST_CONFIG:-}" ] || HOST_CONFIG="${NGCPCTL_MAIN}/config.spce.yml"
[ -n "${LOCAL_CONFIG:-}" ] || LOCAL_CONFIG="${NGCPCTL_MAIN}/constants_local_ce.yml"
[ -n "${CONSTANTS_CONFIG:-}" ] || CONSTANTS_CONFIG="${NGCPCTL_MAIN}/constants.yml"
[ -n "${NETWORK_CONFIG:-}" ] || NETWORK_CONFIG="${NGCPCTL_MAIN}/network.yml"

2
t/fixtures/ngcpcfg_carrier.cfg
Unescape View File

@ -4,7 +4,7 @@
[ -n "${NGCPCTL_CONFIG:-}" ] || NGCPCTL_CONFIG="${NGCPCTL_MAIN}/config.yml"
[ -n "${HA_CONFIG:-}" ] || HA_CONFIG="${NGCPCTL_MAIN}/config.ha.yml"
[ -n "${PAIR_CONFIG:-}" ] || PAIR_CONFIG="${NGCPCTL_MAIN}/config.pair.yml"
[ -n "${HOST_CONFIG:-}" ] || HOST_CONFIG="${NGCPCTL_MAIN}/config.$(hostname).yml"
[ -n "${HOST_CONFIG:-}" ] || HOST_CONFIG="${NGCPCTL_MAIN}/config.web01a.yml"
[ -n "${LOCAL_CONFIG:-}" ] || LOCAL_CONFIG="${NGCPCTL_MAIN}/constants_local_carrier.yml"
[ -n "${CONSTANTS_CONFIG:-}" ] || CONSTANTS_CONFIG="${NGCPCTL_MAIN}/constants.yml"
[ -n "${NETWORK_CONFIG:-}" ] || NETWORK_CONFIG="${NGCPCTL_MAIN}/network_carrier.yml"

2
t/fixtures/ngcpcfg_pro.cfg
Unescape View File

@ -4,7 +4,7 @@
[ -n "${NGCPCTL_CONFIG:-}" ] || NGCPCTL_CONFIG="${NGCPCTL_MAIN}/config.yml"
[ -n "${HA_CONFIG:-}" ] || HA_CONFIG="${NGCPCTL_MAIN}/config.ha.yml"
[ -n "${PAIR_CONFIG:-}" ] || PAIR_CONFIG="${NGCPCTL_MAIN}/config.pair.yml"
[ -n "${HOST_CONFIG:-}" ] || HOST_CONFIG="${NGCPCTL_MAIN}/config.$(hostname).yml"
[ -n "${HOST_CONFIG:-}" ] || HOST_CONFIG="${NGCPCTL_MAIN}/config.sp1.yml"
[ -n "${LOCAL_CONFIG:-}" ] || LOCAL_CONFIG="${NGCPCTL_MAIN}/constants_local_pro.yml"
[ -n "${CONSTANTS_CONFIG:-}" ] || CONSTANTS_CONFIG="${NGCPCTL_MAIN}/constants.yml"
[ -n "${NETWORK_CONFIG:-}" ] || NETWORK_CONFIG="${NGCPCTL_MAIN}/network_pro.yml"

2
testsuite/ngcp-network
Unescape View File

@ -7,6 +7,8 @@ else
CMD="perl -CSD ../sbin/ngcp-network"
fi
PATH=$PATH:../t/fixtures/bin/
count=0
RC=0

Write Preview
Loading…
Cancel
Save