diff options
| -rw-r--r-- | ci/PR_revision.log | 2 | ||||
| -rwxr-xr-x | lib/configure-deps-functions.sh | 2 | ||||
| -rwxr-xr-x | lib/post-install-functions.sh | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/ci/PR_revision.log b/ci/PR_revision.log index cb7f7c83..1328da23 100644 --- a/ci/PR_revision.log +++ b/ci/PR_revision.log @@ -5,3 +5,5 @@ 96,Add etcd service 98,Tacker support 107,Enable ODL clustering +110,Adding endpoint url definitions for tacker +109,Adding endpoint url definitions to congress diff --git a/lib/configure-deps-functions.sh b/lib/configure-deps-functions.sh index b9799969..3c82c66a 100755 --- a/lib/configure-deps-functions.sh +++ b/lib/configure-deps-functions.sh @@ -51,7 +51,7 @@ function configure_deps { echo "${blue}INFO: Creating Virsh Network: $network & OVS Bridge: ${NET_MAP[$network]}${reset}" ovs-vsctl list-br | grep "^${NET_MAP[$network]}$" > /dev/null || ovs-vsctl add-br ${NET_MAP[$network]} virsh net-list --all | grep " $network " > /dev/null || (cat > ${libvirt_dir}/apex-virsh-net.xml && virsh net-define ${libvirt_dir}/apex-virsh-net.xml) << EOF -<network> +<network ipv6='yes'> <name>$network</name> <forward mode='bridge'/> <bridge name='${NET_MAP[$network]}'/> diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh index ae79ea5e..abc43952 100755 --- a/lib/post-install-functions.sh +++ b/lib/post-install-functions.sh @@ -131,7 +131,7 @@ fi if [ "${deploy_options_array['congress']}" == 'True' ]; then ds_configs="--config username=\$OS_USERNAME - --config tenant_name=\$OS_TENANT_NAME + --config tenant_name=service --config password=\$OS_PASSWORD --config auth_url=\$OS_AUTH_URL" for s in nova neutronv2 ceilometer cinder glancev2 keystone; do |