diff options
| author |   Feng Pan <fpan@redhat.com> | 2016-07-31 10:10:19 -0400 |
|---|---|---|
| committer | Feng Pan <fpan@redhat.com> | 2016-07-31 10:10:19 -0400 |
| commit | bf61379130ca7b39334b3aa05afbe76a4d6d78e5 (patch) | |
| tree | e752149f901441854bc5e1c49a27fde3caba80ed /lib/common-functions.sh | |
| parent | 31b10ea2994fc4d6614c0a31b0f54dbd58dc7abc (diff) | |
IPv6 fixes for network settings and post deploy
This patch contains the following:
- Add dns and nic information in network settings file
- Add ipv6 option for find_ip function in common-functions.sh
- Change neutron commands to handle IPv6 during post deploy,
skip NAT configuration if IPv6 is configured.
- Fix an error in python library when generating floating ip
range.
JIRA: APEX-130
Change-Id: I27da7f7a714f42ee827be7091fcb1a6d89a0aae8
Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'lib/common-functions.sh')
| -rw-r--r-- | lib/common-functions.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/common-functions.sh b/lib/common-functions.sh index 2ace9970..391d9405 100644 --- a/lib/common-functions.sh +++ b/lib/common-functions.sh @@ -21,13 +21,19 @@ function prefix2mask { } ##find ip of interface -##params: interface name +##params: interface name, address family function find_ip { + local af if [[ -z "$1" ]]; then return 1 fi + if [[ -z "$2" ]]; then + af=4 + else + af=$2 + fi - python3.4 -B $LIB/python/apex_python_utils.py find-ip -i $1 + python3.4 -B $LIB/python/apex_python_utils.py find-ip -i $1 -af $af } ##attach interface to OVS and set the network config correctly |