devstack

add shebang lines to all lib files With gerrit 2.8, and the new change screen, this will trigger syntax highlighting in gerrit. Thus making reviewing code a lot nicer. Change-Id: Id238748417ffab53e02d59413dba66f61e724383

2014年12月05日 14:25:28 -05:00

#!/bin/bash

#

Move configuration functions into inc/* * config/INI functions from functions-common to to inc/ini-config * local.conf meta-config functions from lib/config to inc/meta-config Change-Id: I00fab724075a693529273878875cfd292d00b18a

2015年03月09日 15:16:10 -05:00

# **lib/meta-config** - Configuration file manipulation functions

#

# Support for DevStack's local.conf meta-config sections

#

Add meta-config via local.conf This defines a new local.conf file that is designed to take the place of all of the 'pass-through'[1] configuration options that have been defined in DevStack. * new local.conf file can contain multiple config file settings to be merged in to existing project config files * localrc can be embedded into local.conf and will auto-extract if localrc does not exist * Adds functions get_meta_section(), get_meta_section_files(), merge_config_file() and merge_config_group() * Adds EXTRA_OPTS, EXTRA_BAREMETAL_OPTS, Q_DHCP_EXTRA_DEFAULT_OPTS and Q_SRV_EXTRA_DEFAULT_OPTS to the deprecated warning list at the end of stack.sh [1] Pass-through options are those that do not configure or change DevStack's behaviour but simply set a value in a project config file. This includes most of the EXTRA_XXX_OPTS configuration variables. Change-Id: I367cadc86116621e9574ac203aafdab483d810d3

2013年09月13日 15:05:51 -05:00

# These functions have no external dependencies and the following side-effects:

#

# CONFIG_AWK_CMD is defined, default is ``awk``

# Meta-config files contain multiple INI-style configuration files

# using a specific new section header to delimit them:

#

# [[group-name|file-name]]

#

# group-name refers to the group of configuration file changes to be processed

whitespace cleanup on functions & lib/config fix some of the bash8 issues found in functions and lib/config, part of the long march towards fixing all the bash8 issues. Change-Id: Ia131f64870acb0f9d196fe1a9a45d633abb6fc4d

2013年10月22日 07:43:22 -04:00

# at a particular time. These are called phases in ``stack.sh`` but

Add meta-config via local.conf This defines a new local.conf file that is designed to take the place of all of the 'pass-through'[1] configuration options that have been defined in DevStack. * new local.conf file can contain multiple config file settings to be merged in to existing project config files * localrc can be embedded into local.conf and will auto-extract if localrc does not exist * Adds functions get_meta_section(), get_meta_section_files(), merge_config_file() and merge_config_group() * Adds EXTRA_OPTS, EXTRA_BAREMETAL_OPTS, Q_DHCP_EXTRA_DEFAULT_OPTS and Q_SRV_EXTRA_DEFAULT_OPTS to the deprecated warning list at the end of stack.sh [1] Pass-through options are those that do not configure or change DevStack's behaviour but simply set a value in a project config file. This includes most of the EXTRA_XXX_OPTS configuration variables. Change-Id: I367cadc86116621e9574ac203aafdab483d810d3

2013年09月13日 15:05:51 -05:00

# group here as these functions are not DevStack-specific.

#

# file-name is the destination of the config file

# Save trace setting

Namespace XTRACE commands I noticed this when debugging some grenade issues failures. An include of grenade/functions stores the current value of XTRACE (on) and disables xtrace for the rest of the import. We then include devstack's "functions" library, which now overwrites the stored value of XTRACE the current state; i.e. disabled. When it finishes it restores the prior state (disabled), and then grenade restores the same value of XTRACE (disabled). The result is that xtrace is incorrectly disabled until the next time it just happens to be turned on. The solution is to name-space the store of the current-value of xtrace so when we finish sourcing a file, we always restore the tracing value to what it was when we entered. Some files had already discovered this. In general there is inconsistency around the setting of the variable, and a lot of obvious copy-paste. This brings consistency across all files by using _XTRACE_* prefixes for the sotre/restore of tracing values. Change-Id: Iba7739eada5711d9c269cb4127fa712e9f961695

2015年10月13日 11:03:03 +11:00

_XTRACE_INC_META=$(set +o | grep xtrace)

Add meta-config via local.conf This defines a new local.conf file that is designed to take the place of all of the 'pass-through'[1] configuration options that have been defined in DevStack. * new local.conf file can contain multiple config file settings to be merged in to existing project config files * localrc can be embedded into local.conf and will auto-extract if localrc does not exist * Adds functions get_meta_section(), get_meta_section_files(), merge_config_file() and merge_config_group() * Adds EXTRA_OPTS, EXTRA_BAREMETAL_OPTS, Q_DHCP_EXTRA_DEFAULT_OPTS and Q_SRV_EXTRA_DEFAULT_OPTS to the deprecated warning list at the end of stack.sh [1] Pass-through options are those that do not configure or change DevStack's behaviour but simply set a value in a project config file. This includes most of the EXTRA_XXX_OPTS configuration variables. Change-Id: I367cadc86116621e9574ac203aafdab483d810d3

2013年09月13日 15:05:51 -05:00

set +o xtrace

# Allow the awk command to be overridden on legacy platforms

CONFIG_AWK_CMD=${CONFIG_AWK_CMD:-awk}

# Get the section for the specific group and config file

# get_meta_section infile group configfile

Enforce function declaration format in bash8 Check that function calls look like ^function foo {$ in bash8, and fix all existing failures of that check. Add a note to HACKING.rst Change-Id: Ic19eecb39e0b20273d1bcd551a42fe400d54e938

2014年02月21日 15:35:08 +11:00

function get_meta_section {

Add meta-config via local.conf This defines a new local.conf file that is designed to take the place of all of the 'pass-through'[1] configuration options that have been defined in DevStack. * new local.conf file can contain multiple config file settings to be merged in to existing project config files * localrc can be embedded into local.conf and will auto-extract if localrc does not exist * Adds functions get_meta_section(), get_meta_section_files(), merge_config_file() and merge_config_group() * Adds EXTRA_OPTS, EXTRA_BAREMETAL_OPTS, Q_DHCP_EXTRA_DEFAULT_OPTS and Q_SRV_EXTRA_DEFAULT_OPTS to the deprecated warning list at the end of stack.sh [1] Pass-through options are those that do not configure or change DevStack's behaviour but simply set a value in a project config file. This includes most of the EXTRA_XXX_OPTS configuration variables. Change-Id: I367cadc86116621e9574ac203aafdab483d810d3

2013年09月13日 15:05:51 -05:00

local file=1ドル

local matchgroup=2ドル

local configfile=3ドル

[[ -r $file ]] || return 0

[[ -z $configfile ]] && return 0

$CONFIG_AWK_CMD -v matchgroup=$matchgroup -v configfile=$configfile '

BEGIN { group = "" }

config: get_meta_section() misunderstands the beginning of metasection For example, the line, "if [[ -n $no_proxy ]]; then" is misparsed as the beginning of metasection because get_meta_section() misses escaping of "|" unlike get_meta_section_files(). This patch adds necessary escape as "|" -> "\|". Change-Id: Ic14b2ac167037c4f5db89492f0e8a4c5b13c7b6d Closes-Bug: #1262960

2013年12月20日 11:55:08 +09:00

/^\[\[.+\|.*\]\]/ {

meta-config: Fix consecutive same sections The current coding fails to process local.conf like the following. Note: This example is taken from a real use case. [1] [[post-config|$NEUTRON_CONF]] [qos] notification_drivers = midonet [[post-config|$NEUTRON_CONF]] [quotas] # x10 of default quotas (at the time of writing) quota_network=100 quota_subnet=100 quota_port=500 quota_router=100 quota_floatingip=500 quota_security_group=100 quota_security_group_rule=1000 [1] https://review.openstack.org/#/c/400627/ Closes-Bug: #1583214 Change-Id: Ie571b5fa5a33d9ed09f30ba7c7724b958ce17616

2016年11月26日 00:43:07 +09:00

gsub("[][]", "", 1ドル);

split(1,ドル a, "|");

if (a[1] == matchgroup && a[2] == configfile) {

group=a[1]

Add meta-config via local.conf This defines a new local.conf file that is designed to take the place of all of the 'pass-through'[1] configuration options that have been defined in DevStack. * new local.conf file can contain multiple config file settings to be merged in to existing project config files * localrc can be embedded into local.conf and will auto-extract if localrc does not exist * Adds functions get_meta_section(), get_meta_section_files(), merge_config_file() and merge_config_group() * Adds EXTRA_OPTS, EXTRA_BAREMETAL_OPTS, Q_DHCP_EXTRA_DEFAULT_OPTS and Q_SRV_EXTRA_DEFAULT_OPTS to the deprecated warning list at the end of stack.sh [1] Pass-through options are those that do not configure or change DevStack's behaviour but simply set a value in a project config file. This includes most of the EXTRA_XXX_OPTS configuration variables. Change-Id: I367cadc86116621e9574ac203aafdab483d810d3

2013年09月13日 15:05:51 -05:00

} else {

group=""

}

next

}

{

if (group != "")

print 0ドル

}

' $file

}

# Get a list of config files for a specific group

# get_meta_section_files infile group

Enforce function declaration format in bash8 Check that function calls look like ^function foo {$ in bash8, and fix all existing failures of that check. Add a note to HACKING.rst Change-Id: Ic19eecb39e0b20273d1bcd551a42fe400d54e938

2014年02月21日 15:35:08 +11:00

function get_meta_section_files {

Add meta-config via local.conf This defines a new local.conf file that is designed to take the place of all of the 'pass-through'[1] configuration options that have been defined in DevStack. * new local.conf file can contain multiple config file settings to be merged in to existing project config files * localrc can be embedded into local.conf and will auto-extract if localrc does not exist * Adds functions get_meta_section(), get_meta_section_files(), merge_config_file() and merge_config_group() * Adds EXTRA_OPTS, EXTRA_BAREMETAL_OPTS, Q_DHCP_EXTRA_DEFAULT_OPTS and Q_SRV_EXTRA_DEFAULT_OPTS to the deprecated warning list at the end of stack.sh [1] Pass-through options are those that do not configure or change DevStack's behaviour but simply set a value in a project config file. This includes most of the EXTRA_XXX_OPTS configuration variables. Change-Id: I367cadc86116621e9574ac203aafdab483d810d3

2013年09月13日 15:05:51 -05:00

local file=1ドル

local matchgroup=2ドル

[[ -r $file ]] || return 0

$CONFIG_AWK_CMD -v matchgroup=$matchgroup '

whitespace cleanup on functions & lib/config fix some of the bash8 issues found in functions and lib/config, part of the long march towards fixing all the bash8 issues. Change-Id: Ia131f64870acb0f9d196fe1a9a45d633abb6fc4d

2013年10月22日 07:43:22 -04:00

/^\[\[.+\|.*\]\]/ {

gsub("[][]", "", 1ドル);

split(1,ドル a, "|");

if (a[1] == matchgroup)

print a[2]

}

Add meta-config via local.conf This defines a new local.conf file that is designed to take the place of all of the 'pass-through'[1] configuration options that have been defined in DevStack. * new local.conf file can contain multiple config file settings to be merged in to existing project config files * localrc can be embedded into local.conf and will auto-extract if localrc does not exist * Adds functions get_meta_section(), get_meta_section_files(), merge_config_file() and merge_config_group() * Adds EXTRA_OPTS, EXTRA_BAREMETAL_OPTS, Q_DHCP_EXTRA_DEFAULT_OPTS and Q_SRV_EXTRA_DEFAULT_OPTS to the deprecated warning list at the end of stack.sh [1] Pass-through options are those that do not configure or change DevStack's behaviour but simply set a value in a project config file. This includes most of the EXTRA_XXX_OPTS configuration variables. Change-Id: I367cadc86116621e9574ac203aafdab483d810d3

2013年09月13日 15:05:51 -05:00

' $file

}

# Merge the contents of a meta-config file into its destination config file

# If configfile does not exist it will be created.

# merge_config_file infile group configfile

Enforce function declaration format in bash8 Check that function calls look like ^function foo {$ in bash8, and fix all existing failures of that check. Add a note to HACKING.rst Change-Id: Ic19eecb39e0b20273d1bcd551a42fe400d54e938

2014年02月21日 15:35:08 +11:00

function merge_config_file {

Add meta-config via local.conf This defines a new local.conf file that is designed to take the place of all of the 'pass-through'[1] configuration options that have been defined in DevStack. * new local.conf file can contain multiple config file settings to be merged in to existing project config files * localrc can be embedded into local.conf and will auto-extract if localrc does not exist * Adds functions get_meta_section(), get_meta_section_files(), merge_config_file() and merge_config_group() * Adds EXTRA_OPTS, EXTRA_BAREMETAL_OPTS, Q_DHCP_EXTRA_DEFAULT_OPTS and Q_SRV_EXTRA_DEFAULT_OPTS to the deprecated warning list at the end of stack.sh [1] Pass-through options are those that do not configure or change DevStack's behaviour but simply set a value in a project config file. This includes most of the EXTRA_XXX_OPTS configuration variables. Change-Id: I367cadc86116621e9574ac203aafdab483d810d3

2013年09月13日 15:05:51 -05:00

local file=1ドル

local matchgroup=2ドル

local configfile=3ドル

Create config file in merge_config_file Change If132a94e53545d9134859aa508da7b9819ede2f8 introduced a small regression; it added an "inidelete" which looks in the config file to delete rows. However, at least for the test-case, the config file isn't created yet. The end result is that the test fails but we don't notice. 2015年04月17日 00:55:03.169 | merge_config_file test-multiline: sed: can't read test-multiline.conf: No such file or directory 2015年04月17日 00:55:03.195 | OK So fix this up by creating the config-file if it isn't there. Also, add "-e" to the test file so we catch things like this in the future. Change-Id: I43a4ecc247f19cccf51d5931dfb687adbd23d6b1

2015年04月17日 11:53:40 +10:00

# note, configfile might be a variable (note the iniset, etc

# created in the mega-awk below is "eval"ed too, so we just leave

# it alone.

Provide an error message on bogus config file spec If local.conf specifies a config file addition in the following way... [[post-config|$MY_CONF_FILE]] [xyz] foo=bar ...and $MY_CONF_FILE points to a file whose directory is not writable by the user running the script, then stack.sh aborts with the following obscure message: 2015年09月01日 08:20:08.113 | touch: setting times of '/': Permission denied This patch modifies inc/meta-config to provide a useful error message, such as: 2015年09月01日 08:20:08.114 | could not create config file / ($MY_CONF_FILE) This patch also modifies inc/meta-config so that it provides an error message if $MY_CONF_FILE is empty (instead of silently ignoring this local.conf statement): 2015年09月01日 09:38:53.406 | bogus config file specification: $MY_CONF_FILE is undefined Change-Id: I9b78407420318548561012a8672762bc7fdd6db6 Closes-Bug: 1490881

2015年09月01日 10:33:10 +02:00

local real_configfile

real_configfile=$(eval echo $configfile)

Create config file in merge_config_file Change If132a94e53545d9134859aa508da7b9819ede2f8 introduced a small regression; it added an "inidelete" which looks in the config file to delete rows. However, at least for the test-case, the config file isn't created yet. The end result is that the test fails but we don't notice. 2015年04月17日 00:55:03.169 | merge_config_file test-multiline: sed: can't read test-multiline.conf: No such file or directory 2015年04月17日 00:55:03.195 | OK So fix this up by creating the config-file if it isn't there. Also, add "-e" to the test file so we catch things like this in the future. Change-Id: I43a4ecc247f19cccf51d5931dfb687adbd23d6b1

2015年04月17日 11:53:40 +10:00

if [ ! -f $real_configfile ]; then

Create parent directory in merge_config_file The code accounts for the config file not existing but it does not account for the parent directory missing. This is currently breaking any Ironic jobs that disable Nova. Change-Id: Ia5fcfe6c63f5cc40b11f7e1f3be244d7897f26f6

2024年06月26日 18:10:43 +02:00

mkdir -p $(dirname $real_configfile) || die $LINENO "could not create the directory of $real_configfile ($configfile)"

Provide an error message on bogus config file spec If local.conf specifies a config file addition in the following way... [[post-config|$MY_CONF_FILE]] [xyz] foo=bar ...and $MY_CONF_FILE points to a file whose directory is not writable by the user running the script, then stack.sh aborts with the following obscure message: 2015年09月01日 08:20:08.113 | touch: setting times of '/': Permission denied This patch modifies inc/meta-config to provide a useful error message, such as: 2015年09月01日 08:20:08.114 | could not create config file / ($MY_CONF_FILE) This patch also modifies inc/meta-config so that it provides an error message if $MY_CONF_FILE is empty (instead of silently ignoring this local.conf statement): 2015年09月01日 09:38:53.406 | bogus config file specification: $MY_CONF_FILE is undefined Change-Id: I9b78407420318548561012a8672762bc7fdd6db6 Closes-Bug: 1490881

2015年09月01日 10:33:10 +02:00

touch $real_configfile || die $LINENO "could not create config file $real_configfile ($configfile)"

Create config file in merge_config_file Change If132a94e53545d9134859aa508da7b9819ede2f8 introduced a small regression; it added an "inidelete" which looks in the config file to delete rows. However, at least for the test-case, the config file isn't created yet. The end result is that the test fails but we don't notice. 2015年04月17日 00:55:03.169 | merge_config_file test-multiline: sed: can't read test-multiline.conf: No such file or directory 2015年04月17日 00:55:03.195 | OK So fix this up by creating the config-file if it isn't there. Also, add "-e" to the test file so we catch things like this in the future. Change-Id: I43a4ecc247f19cccf51d5931dfb687adbd23d6b1

2015年04月17日 11:53:40 +10:00

fi

Add meta-config via local.conf This defines a new local.conf file that is designed to take the place of all of the 'pass-through'[1] configuration options that have been defined in DevStack. * new local.conf file can contain multiple config file settings to be merged in to existing project config files * localrc can be embedded into local.conf and will auto-extract if localrc does not exist * Adds functions get_meta_section(), get_meta_section_files(), merge_config_file() and merge_config_group() * Adds EXTRA_OPTS, EXTRA_BAREMETAL_OPTS, Q_DHCP_EXTRA_DEFAULT_OPTS and Q_SRV_EXTRA_DEFAULT_OPTS to the deprecated warning list at the end of stack.sh [1] Pass-through options are those that do not configure or change DevStack's behaviour but simply set a value in a project config file. This includes most of the EXTRA_XXX_OPTS configuration variables. Change-Id: I367cadc86116621e9574ac203aafdab483d810d3

2013年09月13日 15:05:51 -05:00

get_meta_section $file $matchgroup $configfile | \

$CONFIG_AWK_CMD -v configfile=$configfile '

Allow multi-line config items in meta-section of local.conf It would behave such as the contents from each meta-section in local.conf is copied to the destination files. One exception is the multiline options not grouped together. In that case, the contents will be grouped together in its destination config file. Check tests/test_config.sh for examples. This was originally committed in https://review.openstack.org/128805. But the original change used AWK syntax that is not supported in AWK 3.1.8, and caused syntax error on servers with that AWK version. This patch makes the necessary change so that it's compatible with AWK 3.1.8. Change-Id: Id1e1fe01f05bd0f19ea6e89c4f4c0f8be695dfce Partial-Bug: #1374118

2014年10月15日 21:40:53 -04:00

BEGIN {

section = ""

last_section = ""

section_count = 0

}

Add meta-config via local.conf This defines a new local.conf file that is designed to take the place of all of the 'pass-through'[1] configuration options that have been defined in DevStack. * new local.conf file can contain multiple config file settings to be merged in to existing project config files * localrc can be embedded into local.conf and will auto-extract if localrc does not exist * Adds functions get_meta_section(), get_meta_section_files(), merge_config_file() and merge_config_group() * Adds EXTRA_OPTS, EXTRA_BAREMETAL_OPTS, Q_DHCP_EXTRA_DEFAULT_OPTS and Q_SRV_EXTRA_DEFAULT_OPTS to the deprecated warning list at the end of stack.sh [1] Pass-through options are those that do not configure or change DevStack's behaviour but simply set a value in a project config file. This includes most of the EXTRA_XXX_OPTS configuration variables. Change-Id: I367cadc86116621e9574ac203aafdab483d810d3

2013年09月13日 15:05:51 -05:00

/^\[.+\]/ {

gsub("[][]", "", 1ドル);

section=1ドル

next

}

/^ *\#/ {

next

}

Fix a couple of INI whitespace bugs * iniset() bails if no section or option (attribute) is supplied * merge_config_file() properly skips lines with only whitespace * Also split the ini-tests into their own script Bug 1257954 Change-Id: Ie31c5bd0df8dfed129fbcf1e37228aaf25e9305d

2013年12月04日 17:20:28 -06:00

/^[^ \t]+/ {

local.conf processing doesn't handle '=' in values When attempting to add a libvirt section with a volume_drivers entry to $NOVA_CONF, via a post-config block in the local.conf file, I encountered problems; the value for this attribute takes the form driver=python.import.path.to.driver but the value actually populated in the $NOVA_CONF was truncated at the equals. Taking the iscsi driver setting specified in the official nova.conf documentation as an example, if I have the following in my local.conf file: [[post-config|$NOVA_CONF]] [libvirt] volume_drivers = iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver I will see that the generated $NOVA_CONF has the following: [libvirt] volume_driver = iscsi This occurs because the existing handling for a post-config setion, as implemented in merge_config_file(), splits the line on the equals sign, and then uses the first and seconds elements of the resulting array as attribute name and value respectively. However when an equals occurs as part of the value this results in the value being truncated at the first equals in the value. The fix I've implemented, based upon review feedback, extracts the contents of 0ドル before the first equals as the attr name, and extracts the remainder after the equals as the value. Then it strips the leading and trailing whitespaces from both as appropriate. I've also added test5 to tests/test_config.sh to test for, and verify, correct operation when this scenario is encountered. Similarly I've added test6 to ensure that trailing spaces in values are stripped correctly. Change-Id: Id0cb1e6e1cece21bc5dbf427c4d756af86fbd927 Closes-Bug: #1374482

2014年10月09日 16:16:42 -04:00

# get offset of first '=' in 0ドル

eq_idx = index(0,ドル "=")

# extract attr & value from 0ドル

attr = substr(0,ドル 1, eq_idx - 1)

value = substr(0,ドル eq_idx + 1)

# only need to strip trailing whitespace from attr

sub(/[ \t]*$/, "", attr)

# need to strip leading & trailing whitespace from value

sub(/^[ \t]*/, "", value)

sub(/[ \t]*$/, "", value)

Allow multi-line config items in meta-section of local.conf It would behave such as the contents from each meta-section in local.conf is copied to the destination files. One exception is the multiline options not grouped together. In that case, the contents will be grouped together in its destination config file. Check tests/test_config.sh for examples. This was originally committed in https://review.openstack.org/128805. But the original change used AWK syntax that is not supported in AWK 3.1.8, and caused syntax error on servers with that AWK version. This patch makes the necessary change so that it's compatible with AWK 3.1.8. Change-Id: Id1e1fe01f05bd0f19ea6e89c4f4c0f8be695dfce Partial-Bug: #1374118

2014年10月15日 21:40:53 -04:00

# cfg_attr_count: number of config lines per [section, attr]

# cfg_attr: three dimensional array to keep all the config lines per [section, attr]

# cfg_section: keep the section names in the same order as they appear in local.conf

# cfg_sec_attr_name: keep the attr names in the same order as they appear in local.conf

if (! (section, attr) in cfg_attr_count) {

if (section != last_section) {

cfg_section[section_count++] = section

last_section = section

}

attr_count = cfg_sec_attr_count[section_count - 1]++

cfg_sec_attr_name[section_count - 1, attr_count] = attr

cfg_attr[section, attr, 0] = value

cfg_attr_count[section, attr] = 1

} else {

lno = cfg_attr_count[section, attr]++

cfg_attr[section, attr, lno] = value

}

END {

# Process each section in order

for (sno = 0; sno < section_count; sno++) {

section = cfg_section[sno]

# The ini routines simply append a config item immediately

# after the section header. To keep the same order as defined

# in local.conf, invoke the ini routines in the reverse order

for (attr_no = cfg_sec_attr_count[sno] - 1; attr_no >=0; attr_no--) {

attr = cfg_sec_attr_name[sno, attr_no]

if (cfg_attr_count[section, attr] == 1)

Revert "Single quote iniset argument in merge_config_file" This reverts commit e2c9fee8ed846aba124a2fc1bba245790ed7ba90. We have decided that we don't want to support the json-style argument as described by bug#1374118 (see thread at [1]). This restores the old behavior of sending the argument in double-quotes so environment variables get expanded. As a bonus, tests for this are added. [1] http://lists.openstack.org/pipermail/openstack-dev/2014-October/049341.html Change-Id: I9fc99f3716cc53366907878adb00ae6cf3898f14 Closes-Bug:#1386413

2014年10月29日 21:53:56 +11:00

print "iniset " configfile " " section " " attr " \"" cfg_attr[section, attr, 0] "\""

Allow multi-line config items in meta-section of local.conf It would behave such as the contents from each meta-section in local.conf is copied to the destination files. One exception is the multiline options not grouped together. In that case, the contents will be grouped together in its destination config file. Check tests/test_config.sh for examples. This was originally committed in https://review.openstack.org/128805. But the original change used AWK syntax that is not supported in AWK 3.1.8, and caused syntax error on servers with that AWK version. This patch makes the necessary change so that it's compatible with AWK 3.1.8. Change-Id: Id1e1fe01f05bd0f19ea6e89c4f4c0f8be695dfce Partial-Bug: #1374118

2014年10月15日 21:40:53 -04:00

else {

# For multiline, invoke the ini routines in the reverse order

count = cfg_attr_count[section, attr]

Clear multi-line sections before adding lines With multiline support for local.conf, the first line is created with iniset, which will set *all* previous lines to the same thing, and then subsequent lines will be added. Modify the multiline support to first clear existing lines from the section. This causes fatal errors with neutron.conf, which defines drivers with a bunch of service_provider= options, and the current code ends up with the first driver defined in local.conf being present twice. Change-Id: If132a94e53545d9134859aa508da7b9819ede2f8

2014年12月13日 11:56:16 -07:00

print "inidelete " configfile " " section " " attr

Revert "Single quote iniset argument in merge_config_file" This reverts commit e2c9fee8ed846aba124a2fc1bba245790ed7ba90. We have decided that we don't want to support the json-style argument as described by bug#1374118 (see thread at [1]). This restores the old behavior of sending the argument in double-quotes so environment variables get expanded. As a bonus, tests for this are added. [1] http://lists.openstack.org/pipermail/openstack-dev/2014-October/049341.html Change-Id: I9fc99f3716cc53366907878adb00ae6cf3898f14 Closes-Bug:#1386413

2014年10月29日 21:53:56 +11:00

print "iniset " configfile " " section " " attr " \"" cfg_attr[section, attr, count - 1] "\""

Allow multi-line config items in meta-section of local.conf It would behave such as the contents from each meta-section in local.conf is copied to the destination files. One exception is the multiline options not grouped together. In that case, the contents will be grouped together in its destination config file. Check tests/test_config.sh for examples. This was originally committed in https://review.openstack.org/128805. But the original change used AWK syntax that is not supported in AWK 3.1.8, and caused syntax error on servers with that AWK version. This patch makes the necessary change so that it's compatible with AWK 3.1.8. Change-Id: Id1e1fe01f05bd0f19ea6e89c4f4c0f8be695dfce Partial-Bug: #1374118

2014年10月15日 21:40:53 -04:00

for (l = count -2; l >= 0; l--)

Revert "Single quote iniset argument in merge_config_file" This reverts commit e2c9fee8ed846aba124a2fc1bba245790ed7ba90. We have decided that we don't want to support the json-style argument as described by bug#1374118 (see thread at [1]). This restores the old behavior of sending the argument in double-quotes so environment variables get expanded. As a bonus, tests for this are added. [1] http://lists.openstack.org/pipermail/openstack-dev/2014-October/049341.html Change-Id: I9fc99f3716cc53366907878adb00ae6cf3898f14 Closes-Bug:#1386413

2014年10月29日 21:53:56 +11:00

print "iniadd_literal " configfile " " section " " attr " \"" cfg_attr[section, attr, l] "\""

Allow multi-line config items in meta-section of local.conf It would behave such as the contents from each meta-section in local.conf is copied to the destination files. One exception is the multiline options not grouped together. In that case, the contents will be grouped together in its destination config file. Check tests/test_config.sh for examples. This was originally committed in https://review.openstack.org/128805. But the original change used AWK syntax that is not supported in AWK 3.1.8, and caused syntax error on servers with that AWK version. This patch makes the necessary change so that it's compatible with AWK 3.1.8. Change-Id: Id1e1fe01f05bd0f19ea6e89c4f4c0f8be695dfce Partial-Bug: #1374118

2014年10月15日 21:40:53 -04:00

}

Add meta-config via local.conf This defines a new local.conf file that is designed to take the place of all of the 'pass-through'[1] configuration options that have been defined in DevStack. * new local.conf file can contain multiple config file settings to be merged in to existing project config files * localrc can be embedded into local.conf and will auto-extract if localrc does not exist * Adds functions get_meta_section(), get_meta_section_files(), merge_config_file() and merge_config_group() * Adds EXTRA_OPTS, EXTRA_BAREMETAL_OPTS, Q_DHCP_EXTRA_DEFAULT_OPTS and Q_SRV_EXTRA_DEFAULT_OPTS to the deprecated warning list at the end of stack.sh [1] Pass-through options are those that do not configure or change DevStack's behaviour but simply set a value in a project config file. This includes most of the EXTRA_XXX_OPTS configuration variables. Change-Id: I367cadc86116621e9574ac203aafdab483d810d3

2013年09月13日 15:05:51 -05:00

}

' | while read a; do eval "$a"; done

}

# Merge all of the files specified by group

# merge_config_group infile group [group ...]

Enforce function declaration format in bash8 Check that function calls look like ^function foo {$ in bash8, and fix all existing failures of that check. Add a note to HACKING.rst Change-Id: Ic19eecb39e0b20273d1bcd551a42fe400d54e938

2014年02月21日 15:35:08 +11:00

function merge_config_group {

Add meta-config via local.conf This defines a new local.conf file that is designed to take the place of all of the 'pass-through'[1] configuration options that have been defined in DevStack. * new local.conf file can contain multiple config file settings to be merged in to existing project config files * localrc can be embedded into local.conf and will auto-extract if localrc does not exist * Adds functions get_meta_section(), get_meta_section_files(), merge_config_file() and merge_config_group() * Adds EXTRA_OPTS, EXTRA_BAREMETAL_OPTS, Q_DHCP_EXTRA_DEFAULT_OPTS and Q_SRV_EXTRA_DEFAULT_OPTS to the deprecated warning list at the end of stack.sh [1] Pass-through options are those that do not configure or change DevStack's behaviour but simply set a value in a project config file. This includes most of the EXTRA_XXX_OPTS configuration variables. Change-Id: I367cadc86116621e9574ac203aafdab483d810d3

2013年09月13日 15:05:51 -05:00

local localfile=1ドル; shift

local matchgroups=$@

[[ -r $localfile ]] || return 0

Clean up local variable usage - Remainder Minor cleanups in a couple ofplaces: * Config funtions * Stackforge * TLS Combined a couple of smaller changesets that are loosly related Change-Id: Ifa16f2e4c0eca0ef3401c0dfdc4f3d91809021a5

2014年07月25日 14:57:54 -05:00

local configfile group

Add meta-config via local.conf This defines a new local.conf file that is designed to take the place of all of the 'pass-through'[1] configuration options that have been defined in DevStack. * new local.conf file can contain multiple config file settings to be merged in to existing project config files * localrc can be embedded into local.conf and will auto-extract if localrc does not exist * Adds functions get_meta_section(), get_meta_section_files(), merge_config_file() and merge_config_group() * Adds EXTRA_OPTS, EXTRA_BAREMETAL_OPTS, Q_DHCP_EXTRA_DEFAULT_OPTS and Q_SRV_EXTRA_DEFAULT_OPTS to the deprecated warning list at the end of stack.sh [1] Pass-through options are those that do not configure or change DevStack's behaviour but simply set a value in a project config file. This includes most of the EXTRA_XXX_OPTS configuration variables. Change-Id: I367cadc86116621e9574ac203aafdab483d810d3

2013年09月13日 15:05:51 -05:00

for group in $matchgroups; do

for configfile in $(get_meta_section_files $localfile $group); do

Provide an error message on bogus config file spec If local.conf specifies a config file addition in the following way... [[post-config|$MY_CONF_FILE]] [xyz] foo=bar ...and $MY_CONF_FILE points to a file whose directory is not writable by the user running the script, then stack.sh aborts with the following obscure message: 2015年09月01日 08:20:08.113 | touch: setting times of '/': Permission denied This patch modifies inc/meta-config to provide a useful error message, such as: 2015年09月01日 08:20:08.114 | could not create config file / ($MY_CONF_FILE) This patch also modifies inc/meta-config so that it provides an error message if $MY_CONF_FILE is empty (instead of silently ignoring this local.conf statement): 2015年09月01日 09:38:53.406 | bogus config file specification: $MY_CONF_FILE is undefined Change-Id: I9b78407420318548561012a8672762bc7fdd6db6 Closes-Bug: 1490881

2015年09月01日 10:33:10 +02:00

local realconfigfile

local dir

realconfigfile=$(eval "echo $configfile")

if [[ -z $realconfigfile ]]; then

Warn instead of die on undefined config names When using local.conf in multinode envs not everything is going to be defined in all places. Eventually we probably want to make it so we have a host role for these sections or something. But for now warn instead of die when we can't find a config var. Change-Id: I6959099373f035fbfe9e540a44e4c52b8e7c95c0 Closes-Bug: #2000824

2016年12月09日 07:33:01 -05:00

warn $LINENO "unknown config file specification: $configfile is undefined"

break

Provide an error message on bogus config file spec If local.conf specifies a config file addition in the following way... [[post-config|$MY_CONF_FILE]] [xyz] foo=bar ...and $MY_CONF_FILE points to a file whose directory is not writable by the user running the script, then stack.sh aborts with the following obscure message: 2015年09月01日 08:20:08.113 | touch: setting times of '/': Permission denied This patch modifies inc/meta-config to provide a useful error message, such as: 2015年09月01日 08:20:08.114 | could not create config file / ($MY_CONF_FILE) This patch also modifies inc/meta-config so that it provides an error message if $MY_CONF_FILE is empty (instead of silently ignoring this local.conf statement): 2015年09月01日 09:38:53.406 | bogus config file specification: $MY_CONF_FILE is undefined Change-Id: I9b78407420318548561012a8672762bc7fdd6db6 Closes-Bug: 1490881

2015年09月01日 10:33:10 +02:00

fi

dir=$(dirname $realconfigfile)

if [[ -d $dir ]]; then

Add meta-config via local.conf This defines a new local.conf file that is designed to take the place of all of the 'pass-through'[1] configuration options that have been defined in DevStack. * new local.conf file can contain multiple config file settings to be merged in to existing project config files * localrc can be embedded into local.conf and will auto-extract if localrc does not exist * Adds functions get_meta_section(), get_meta_section_files(), merge_config_file() and merge_config_group() * Adds EXTRA_OPTS, EXTRA_BAREMETAL_OPTS, Q_DHCP_EXTRA_DEFAULT_OPTS and Q_SRV_EXTRA_DEFAULT_OPTS to the deprecated warning list at the end of stack.sh [1] Pass-through options are those that do not configure or change DevStack's behaviour but simply set a value in a project config file. This includes most of the EXTRA_XXX_OPTS configuration variables. Change-Id: I367cadc86116621e9574ac203aafdab483d810d3

2013年09月13日 15:05:51 -05:00

merge_config_file $localfile $group $configfile

Provide an error message on bogus config file spec If local.conf specifies a config file addition in the following way... [[post-config|$MY_CONF_FILE]] [xyz] foo=bar ...and $MY_CONF_FILE points to a file whose directory is not writable by the user running the script, then stack.sh aborts with the following obscure message: 2015年09月01日 08:20:08.113 | touch: setting times of '/': Permission denied This patch modifies inc/meta-config to provide a useful error message, such as: 2015年09月01日 08:20:08.114 | could not create config file / ($MY_CONF_FILE) This patch also modifies inc/meta-config so that it provides an error message if $MY_CONF_FILE is empty (instead of silently ignoring this local.conf statement): 2015年09月01日 09:38:53.406 | bogus config file specification: $MY_CONF_FILE is undefined Change-Id: I9b78407420318548561012a8672762bc7fdd6db6 Closes-Bug: 1490881

2015年09月01日 10:33:10 +02:00

else

die $LINENO "bogus config file specification $configfile ($configfile=$realconfigfile, $dir is not a directory)"

Add meta-config via local.conf This defines a new local.conf file that is designed to take the place of all of the 'pass-through'[1] configuration options that have been defined in DevStack. * new local.conf file can contain multiple config file settings to be merged in to existing project config files * localrc can be embedded into local.conf and will auto-extract if localrc does not exist * Adds functions get_meta_section(), get_meta_section_files(), merge_config_file() and merge_config_group() * Adds EXTRA_OPTS, EXTRA_BAREMETAL_OPTS, Q_DHCP_EXTRA_DEFAULT_OPTS and Q_SRV_EXTRA_DEFAULT_OPTS to the deprecated warning list at the end of stack.sh [1] Pass-through options are those that do not configure or change DevStack's behaviour but simply set a value in a project config file. This includes most of the EXTRA_XXX_OPTS configuration variables. Change-Id: I367cadc86116621e9574ac203aafdab483d810d3

2013年09月13日 15:05:51 -05:00

fi

done

}

XenAPI: add support to use local.conf XenServer install with devstack doesn't support local.conf, this fix is to add support for using local.conf and backward-compatibility of localrc Change-Id: Ie494e01f8f1ecb8720e14392ef3f12d5a5a01dcd Closes-Bug: #1528520

2015年12月23日 02:17:01 +00:00

function extract_localrc_section {

local configfile=1ドル # top_dir/local.conf

local localrcfile=2ドル # top_dir/localrc

local localautofile=3ドル # top_dir/.localrc.auto

if [[ -r $configfile ]]; then

LRC=$(get_meta_section_files $configfile local)

for lfile in $LRC; do

if [[ "$lfile" == "localrc" ]]; then

if [[ -r $localrcfile ]]; then

echo "localrc and local.conf:[[local]] both exist, using localrc"

else

echo "# Generated file, do not edit" >$localautofile

get_meta_section $configfile local $lfile >>$localautofile

fi

done

fi

}

Add meta-config via local.conf This defines a new local.conf file that is designed to take the place of all of the 'pass-through'[1] configuration options that have been defined in DevStack. * new local.conf file can contain multiple config file settings to be merged in to existing project config files * localrc can be embedded into local.conf and will auto-extract if localrc does not exist * Adds functions get_meta_section(), get_meta_section_files(), merge_config_file() and merge_config_group() * Adds EXTRA_OPTS, EXTRA_BAREMETAL_OPTS, Q_DHCP_EXTRA_DEFAULT_OPTS and Q_SRV_EXTRA_DEFAULT_OPTS to the deprecated warning list at the end of stack.sh [1] Pass-through options are those that do not configure or change DevStack's behaviour but simply set a value in a project config file. This includes most of the EXTRA_XXX_OPTS configuration variables. Change-Id: I367cadc86116621e9574ac203aafdab483d810d3

2013年09月13日 15:05:51 -05:00

# Restore xtrace

Namespace XTRACE commands I noticed this when debugging some grenade issues failures. An include of grenade/functions stores the current value of XTRACE (on) and disables xtrace for the rest of the import. We then include devstack's "functions" library, which now overwrites the stored value of XTRACE the current state; i.e. disabled. When it finishes it restores the prior state (disabled), and then grenade restores the same value of XTRACE (disabled). The result is that xtrace is incorrectly disabled until the next time it just happens to be turned on. The solution is to name-space the store of the current-value of xtrace so when we finish sourcing a file, we always restore the tracing value to what it was when we entered. Some files had already discovered this. In general there is inconsistency around the setting of the variable, and a lot of obvious copy-paste. This brings consistency across all files by using _XTRACE_* prefixes for the sotre/restore of tracing values. Change-Id: Iba7739eada5711d9c269cb4127fa712e9f961695

2015年10月13日 11:03:03 +11:00

$_XTRACE_INC_META

Add meta-config via local.conf This defines a new local.conf file that is designed to take the place of all of the 'pass-through'[1] configuration options that have been defined in DevStack. * new local.conf file can contain multiple config file settings to be merged in to existing project config files * localrc can be embedded into local.conf and will auto-extract if localrc does not exist * Adds functions get_meta_section(), get_meta_section_files(), merge_config_file() and merge_config_group() * Adds EXTRA_OPTS, EXTRA_BAREMETAL_OPTS, Q_DHCP_EXTRA_DEFAULT_OPTS and Q_SRV_EXTRA_DEFAULT_OPTS to the deprecated warning list at the end of stack.sh [1] Pass-through options are those that do not configure or change DevStack's behaviour but simply set a value in a project config file. This includes most of the EXTRA_XXX_OPTS configuration variables. Change-Id: I367cadc86116621e9574ac203aafdab483d810d3

2013年09月13日 15:05:51 -05:00

# Local variables:

# mode: shell-script

# End:

openstack/devstack - devstack - OpenDev: Free Software Needs Free Tools

224 lines

7.5 KiB

Plaintext

Raw Normal View History

openstack/devstack - devstack - OpenDev: Free Software Needs Free Tools

224 lines 7.5 KiB Plaintext Raw Normal View History Unescape Escape

224 lines

7.5 KiB

Plaintext

Raw Normal View History