openstack
/
tripleo-image-elements
Code Issues Proposed changes

Add an element to install os-net-config. 

Change-Id: Ide8c5645c272a80521a57e4696ae4e0cbfed6750
This commit is contained in:
Dan Prince 2014-07-01 22:12:58 -04:00
parent 4b3d93e144
commit 6d3515cd9d
7 changed files with 86 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
elements/os-net-config/README.md Normal file
View File

@ -0,0 +1,31 @@
Install, configure, and (optionally) run os-net-config.
Installs os-net-config and configures a JSON formatted config file
at /etc/os-net-config/config.json. The os-net-config command
is only executed if configuration metadata is provided.
Configuration
-------------
os\_net\_config: JSON (or YAML) metadata in the os-net-config format.
Config Examples:
---------------
```
{ "os_net_config":
{ "network_config": [
{
"type": "ovs_bridge",
"name": "br-ctlplane",
"use_dhcp": "true",
"primary": "true",
"members": [
{
"type": "interface",
"name": "em1"
}
]
}
]}
}
```

3
elements/os-net-config/element-deps Normal file
View File

@ -0,0 +1,3 @@
os-apply-config
os-refresh-config
pip-manifest

6
elements/os-net-config/environment.d/10-os-net-config-venv-dir.bash Normal file
View File

@ -0,0 +1,6 @@
if [ -z "${OS_NET_CONFIG_VENV_DIR:-}" ]; then
export OS_NET_CONFIG_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/os-net-config"}
fi
if [ -z "${OS_NET_CONFIG_INSTALL_OPTS:-}" ]; then
export OS_NET_CONFIG_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""}
fi

4
elements/os-net-config/install.d/os-net-config-package-install/50-os-net-config-package Executable file
View File

@ -0,0 +1,4 @@
#!/bin/bash
set -eux
install-packages os-net-config

31
elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source Executable file
View File

@ -0,0 +1,31 @@
#!/bin/bash
set -ex
manifest=$(get-pip-manifest os-net-config)
virtualenv --setuptools $OS_NET_CONFIG_VENV_DIR
set +u
source $OS_NET_CONFIG_VENV_DIR/bin/activate
set -u
if [ -n "$manifest" ]; then
use-pip-manifest $manifest
else
# bug #1201253 : virtualenv-1.10.1 embeds setuptools-0.9.8, which
# doesn't manage correctly HTTPS sockets when downloading pbr from
# https://pypi.python.org/simple/ if using http_proxy and https_proxy
# envvars
$OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0'
# bug #1293812 : Avoid easy_install triggering on pbr.
$OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.6,<1.0'
$OS_NET_CONFIG_VENV_DIR/bin/pip install --pre -U os-net-config
fi
# Write the manifest of what was installed
write-pip-manifest os-net-config
ln -s $OS_NET_CONFIG_VENV_DIR/bin/os-net-config /usr/local/bin/os-net-config
set +u
deactivate
set -u

3
elements/os-net-config/os-apply-config/etc/os-net-config/config.json Normal file
View File

@ -0,0 +1,3 @@
{{#os_net_config}}
{{.}}
{{/os_net_config}}

8
elements/os-net-config/os-refresh-config/configure.d/20-os-net-config Executable file
View File

@ -0,0 +1,8 @@
#!/bin/bash
set -eux
NET_CONFIG=$(os-apply-config --key os_net_config --type raw --key-default '')
if [ -n "$NET_CONFIG" ]; then
os-net-config -c /etc/os-net-config/config.json -d
fi