openstack
/
fuel-mirror
Code Issues Proposed changes

Fix incorrect Fuel config source

This commit is contained in:
Vitaly Parakhin 2015-05-28 14:07:56 +03:00
parent 2a3f61072f
commit 9932e785db
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/fuel.cfg
View File

@ -19,8 +19,8 @@ else
DOCKER_MODE=true DOCKER_MODE=true
# autodetect Fuel settings # autodetect Fuel settings
source <( $BINROOT/util/parse_yaml.py /etc/fuel/astute.yaml "FUEL" ) source <( dockerctl shell astute cat /etc/fuel/astute.yaml | $BINROOT/util/parse_yaml.py "FUEL" )
source <( $BINROOT/util/parse_yaml.py /etc/nailgun/version.yaml "FUEL" ) source <( dockerctl shell nailgun cat /etc/nailgun/version.yaml | $BINROOT/util/parse_yaml.py "FUEL" )
FUEL_VERSION=$FUEL_VERSION_release FUEL_VERSION=$FUEL_VERSION_release
FUEL_SERVER=$FUEL_ADMIN_NETWORK_ipaddress FUEL_SERVER=$FUEL_ADMIN_NETWORK_ipaddress
FULL_RELEASE=$FUEL_VERSION_openstack_version FULL_RELEASE=$FUEL_VERSION_openstack_version

7
util/parse_yaml.py
View File

@ -1,12 +1,11 @@
#!/usr/bin/python #!/usr/bin/python
# Enumerate YAML file and produce prefixed output # Enumerate YAML from stdin and produce prefixed output
import re import re
import sys import sys
import yaml import yaml
filename = sys.argv[1] prefix = sys.argv[1]
prefix = sys.argv[2]
def serialize(value, name): def serialize(value, name):
if value is None: if value is None:
@ -22,6 +21,6 @@ def serialize(value, name):
else: else:
print('{0}="{1}"'.format(name, value)) print('{0}="{1}"'.format(name, value))
with open(filename, 'r') as yaml_file: with sys.stdin as yaml_file:
data = yaml.load(yaml_file) data = yaml.load(yaml_file)
serialize(data, prefix) serialize(data, prefix)