openstack
/
octavia
Code Issues Proposed changes

Stop depending on tripleo-image-elements 

There were only two elements we were using from this repo -
os-svc-install which we werent actually calling anywhere, we only
depended on it needelessly and sysctl. The sysctl element has been moved
in to dib as dib-sysctl so we can now stop depending on
tripleo-image-elements entirely.

Depends-On: If312d199388036d6f4103e94dca99249cb3bcbaf
Depends-On: Ia730850a48e2478fd5461710a9d2619408725cd8
Change-Id: Ie78c4f3ebe506214f0ce7c456fcbbee09d35ba2a
This commit is contained in:
Gregory Haynes 2016-08-17 16:30:18 +00:00 committed by Lubosz "diltram" Kosnik
parent 547d03ae25
commit 3c5c13c69c
12 changed files with 53 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/plugin.sh
View File

@ -10,7 +10,6 @@ function octavia_install {
if ! [ "$DISABLE_AMP_IMAGE_BUILD" == 'True' ]; then
install_package qemu kpartx
git_clone $DISKIMAGE_BUILDER_REPO $DISKIMAGE_BUILDER_DIR $DISKIMAGE_BUILDER_BRANCH
git_clone $TRIPLEO_IMAGE_ELEMENTS_REPO $TRIPLEO_IMAGE_ELEMENTS_DIR $TRIPLEO_IMAGE_ELEMENTS_BRANCH
sudo -H -E pip install -r $DEST/diskimage-builder/requirements.txt
fi
}

3
devstack/settings
View File

@ -5,9 +5,6 @@ OCTAVIA_DIR=${OCTAVIA_DIR:-"${DEST}/octavia"}
DISKIMAGE_BUILDER_REPO=${DISKIMAGE_BUILDER_REPO:-${GIT_BASE}/openstack/diskimage-builder.git}
DISKIMAGE_BUILDER_BRANCH=${DISKIMAGE_BUILDER_BRANCH:-master}
DISKIMAGE_BUILDER_DIR=$DEST/diskimage-builder
TRIPLEO_IMAGE_ELEMENTS_REPO=${TRIPLEO_IMAGE_ELEMENTS_REPO:-${GIT_BASE}/openstack/tripleo-image-elements.git}
TRIPLEO_IMAGE_ELEMENTS_BRANCH=${TRIPLEO_IMAGE_ELEMENTS_BRANCH:-master}
TRIPLEO_IMAGE_ELEMENTS_DIR=$DEST/tripleo-image-elements
OCTAVIA_BIN_DIR=${OCTAVIA_BIN_DIR:-$(get_python_exec_prefix)}
OCTAVIA_CONF_DIR=${OCTAVIA_CONF_DIR:-"/etc/octavia"}
OCTAVIA_AUTH_CACHE_DIR=${OCTAVIA_AUTH_CACHE_DIR:-"/var/cache/octavia"}

18
diskimage-create/README.rst
View File

@ -24,25 +24,21 @@ Python pip should be installed as well as the following python modules:
Your cache directory should have at least 1GB available, the working directory
will need ~1.5GB, and your image destination will need ~500MB
The script expects to find the diskimage-builder and tripleo-image-elements
git repositories one directory above the Octavia git repository.
The script expects to find the diskimage-builder git repository one
directory above the Octavia git repository.
| /<some directory>/octavia
| /<some directory>/diskimage-builder
| /<some directory>/tripleo-image-elements
| cd /<some directory>
| git clone https://github.com/openstack/octavia.git
| git clone https://git.openstack.org/openstack/diskimage-builder.git
| git clone https://git.openstack.org/openstack/tripleo-image-elements.git
These paths can be overridden with the following environment variables:
| OCTAVIA_REPO_PATH = /<some directory>/octavia
| DIB_REPO_PATH = /<some directory>/diskimage-builder
| DIB_ELEMENTS = /<some directory>/diskimage-builder/elements
| ELEMENTS_REPO_PATH = /<some directory>/tripleo-image-elements
| TRIPLEO_ELEMENTS_PATH = /<some directory>/tripleo-image-elements/elements
The following packages are required on each platform:
Ubuntu and Fedora: qemu kpartx git
@ -147,16 +143,6 @@ DIB_REPO_PATH
- Default: <directory above OCTAVIA_HOME>/diskimage-builder
- Reference: https://github.com/openstack/diskimage-builder
ELEMENTS_PATH
- Directory that contains the default elements
- Default: <ELEMENTS_REPO_PATH>/elements
- Reference: https://github.com/openstack/tripleo-image-elements
ELEMENTS_REPO_PATH
- Directory containing tripleo-image-elements
- Default: <directory above OCTAVIA_HOME>/tripleo-image-elements
- Reference: https://github.com/openstack/tripleo-image-elements
OCTAVIA_REPO_PATH
- Directory containing octavia
- Default: <directory above the script location>

15
diskimage-create/diskimage-create.sh
View File

@ -199,21 +199,10 @@ fi
# For system-wide installs, DIB will automatically find the elements, so we only check local path
DIB_ELEMENTS_PATH=${DIB_REPO_PATH:-${OCTAVIA_REPO_PATH%/*}/diskimage-builder/elements}
TRIPLEO_ELEMENTS_PATH=${TRIPLEO_ELEMENTS_PATH:-${OCTAVIA_REPO_PATH%/*}/tripleo-image-elements/elements}
if ! [ -d $TRIPLEO_ELEMENTS_PATH ]; then
SYSTEM_TRIPLEO_ELEMENTS_PATH=$(find_system_elements tripleo-image-elements)
if [ -z ${SYSTEM_TRIPLEO_ELEMENTS_PATH} ]; then
echo "ERROR: tripleo-image-elements elements directory not found at: " $TRIPLEO_ELEMENTS_PATH " Exiting."
exit 1
fi
TRIPLEO_ELEMENTS_PATH=${SYSTEM_TRIPLEO_ELEMENTS_PATH}
fi
if [ "$DIB_LOCAL_ELEMENTS_PATH" ]; then
export ELEMENTS_PATH=$DIB_ELEMENTS_PATH:$TRIPLEO_ELEMENTS_PATH:$OCTAVIA_ELEMENTS_PATH:$DIB_LOCAL_ELEMENTS_PATH
export ELEMENTS_PATH=$DIB_ELEMENTS_PATH:$OCTAVIA_ELEMENTS_PATH:$DIB_LOCAL_ELEMENTS_PATH
else
export ELEMENTS_PATH=$DIB_ELEMENTS_PATH:$TRIPLEO_ELEMENTS_PATH:$OCTAVIA_ELEMENTS_PATH
export ELEMENTS_PATH=$DIB_ELEMENTS_PATH:$OCTAVIA_ELEMENTS_PATH
fi
export CLOUD_INIT_DATASOURCES=${CLOUD_INIT_DATASOURCES:-"ConfigDrive"}

1
elements/amphora-agent/element-deps
View File

@ -1,3 +1,4 @@
dib-init-system
package-installs
pip-and-virtualenv
source-repositories

1
elements/amphora-agent/package-installs.yaml
View File

@ -1,2 +1,3 @@
libffi-dev:
libssl-dev:
python-dev:

1
elements/haproxy-octavia-ubuntu/element-deps
View File

@ -1,4 +1,3 @@
os-svc-install
package-installs
pkg-map
sysctl

46
elements/haproxy-octavia-ubuntu/post-install.d/20-haproxy-tune-kernel
View File

@ -3,29 +3,29 @@
set -eu
set -o pipefail
sysctl-set-value net.ipv4.tcp_max_tw_buckets 5800000
sysctl-set-value net.ipv4.tcp_max_orphans 5800000
sysctl-set-value net.ipv4.tcp_max_syn_backlog 100000
sysctl-set-value net.ipv4.tcp_keepalive_time 300
sysctl-set-value net.ipv4.tcp_tw_recycle 0
sysctl-set-value net.ipv4.tcp_tw_reuse 1
sysctl-set-value net.ipv4.tcp_timestamps 0
sysctl-set-value net.ipv4.tcp_ecn 0
sysctl-set-value net.ipv4.tcp_sack 0
sysctl-set-value net.ipv4.tcp_dsack 0
sysctl-set-value net.core.somaxconn 65534
sysctl-set-value net.ipv4.tcp_synack_retries 3
sysctl-set-value net.core.netdev_max_backlog 100000
sysctl-set-value fs.file-max 1048576
sysctl-write-value net.ipv4.tcp_max_tw_buckets 5800000
sysctl-write-value net.ipv4.tcp_max_orphans 5800000
sysctl-write-value net.ipv4.tcp_max_syn_backlog 100000
sysctl-write-value net.ipv4.tcp_keepalive_time 300
sysctl-write-value net.ipv4.tcp_tw_recycle 0
sysctl-write-value net.ipv4.tcp_tw_reuse 1
sysctl-write-value net.ipv4.tcp_timestamps 0
sysctl-write-value net.ipv4.tcp_ecn 0
sysctl-write-value net.ipv4.tcp_sack 0
sysctl-write-value net.ipv4.tcp_dsack 0
sysctl-write-value net.core.somaxconn 65534
sysctl-write-value net.ipv4.tcp_synack_retries 3
sysctl-write-value net.core.netdev_max_backlog 100000
sysctl-write-value fs.file-max 1048576
# It's ok for these to fail if conntrack module isn't loaded
sysctl-set-value net.netfilter.nf_conntrack_max 131072 || true
sysctl-set-value net.ipv4.netfilter.ip_conntrack_max 1524288 || true
sysctl-set-value net.ipv4.netfilter.ip_conntrack_tcp_timeout_time_wait 5 || true
sysctl-set-value net.ipv4.netfilter.ip_conntrack_tcp_timeout_fin_wait 5 || true
sysctl-write-value net.netfilter.nf_conntrack_max 131072 || true
sysctl-write-value net.ipv4.netfilter.ip_conntrack_max 1524288 || true
sysctl-write-value net.ipv4.netfilter.ip_conntrack_tcp_timeout_time_wait 5 || true
sysctl-write-value net.ipv4.netfilter.ip_conntrack_tcp_timeout_fin_wait 5 || true
sysctl-set-value net.ipv4.tcp_fin_timeout 5
sysctl-set-value net.ipv4.ip_nonlocal_bind 1
sysctl-set-value net.ipv4.tcp_rmem "16384 65536 524288"
sysctl-set-value net.ipv4.tcp_wmem "16384 349520 699040"
sysctl-set-value net.ipv4.ip_local_port_range "1025 65534"
sysctl-write-value net.ipv4.tcp_fin_timeout 5
sysctl-write-value net.ipv4.ip_nonlocal_bind 1
sysctl-write-value net.ipv4.tcp_rmem "16384 65536 524288"
sysctl-write-value net.ipv4.tcp_wmem "16384 349520 699040"
sysctl-write-value net.ipv4.ip_local_port_range "1025 65534"

2
elements/haproxy-octavia/element-deps
View File

@ -1,3 +1,3 @@
os-svc-install
package-installs
sysctl
pkg-map

46
elements/haproxy-octavia/post-install.d/20-haproxy-tune-kernel
View File

@ -3,29 +3,29 @@
set -eu
set -o pipefail
sysctl-set-value net.ipv4.tcp_max_tw_buckets 5800000
sysctl-set-value net.ipv4.tcp_max_orphans 5800000
sysctl-set-value net.ipv4.tcp_max_syn_backlog 100000
sysctl-set-value net.ipv4.tcp_keepalive_time 300
sysctl-set-value net.ipv4.tcp_tw_recycle 0
sysctl-set-value net.ipv4.tcp_tw_reuse 1
sysctl-set-value net.ipv4.tcp_timestamps 0
sysctl-set-value net.ipv4.tcp_ecn 0
sysctl-set-value net.ipv4.tcp_sack 0
sysctl-set-value net.ipv4.tcp_dsack 0
sysctl-set-value net.core.somaxconn 65534
sysctl-set-value net.ipv4.tcp_synack_retries 3
sysctl-set-value net.core.netdev_max_backlog 100000
sysctl-set-value fs.file-max 1048576
sysctl-write-value net.ipv4.tcp_max_tw_buckets 5800000
sysctl-write-value net.ipv4.tcp_max_orphans 5800000
sysctl-write-value net.ipv4.tcp_max_syn_backlog 100000
sysctl-write-value net.ipv4.tcp_keepalive_time 300
sysctl-write-value net.ipv4.tcp_tw_recycle 0
sysctl-write-value net.ipv4.tcp_tw_reuse 1
sysctl-write-value net.ipv4.tcp_timestamps 0
sysctl-write-value net.ipv4.tcp_ecn 0
sysctl-write-value net.ipv4.tcp_sack 0
sysctl-write-value net.ipv4.tcp_dsack 0
sysctl-write-value net.core.somaxconn 65534
sysctl-write-value net.ipv4.tcp_synack_retries 3
sysctl-write-value net.core.netdev_max_backlog 100000
sysctl-write-value fs.file-max 1048576
# It's ok for these to fail if conntrack module isn't loaded
sysctl-set-value net.netfilter.nf_conntrack_max 131072 || true
sysctl-set-value net.ipv4.netfilter.ip_conntrack_max 1524288 || true
sysctl-set-value net.ipv4.netfilter.ip_conntrack_tcp_timeout_time_wait 5 || true
sysctl-set-value net.ipv4.netfilter.ip_conntrack_tcp_timeout_fin_wait 5 || true
sysctl-write-value net.netfilter.nf_conntrack_max 131072 || true
sysctl-write-value net.ipv4.netfilter.ip_conntrack_max 1524288 || true
sysctl-write-value net.ipv4.netfilter.ip_conntrack_tcp_timeout_time_wait 5 || true
sysctl-write-value net.ipv4.netfilter.ip_conntrack_tcp_timeout_fin_wait 5 || true
sysctl-set-value net.ipv4.tcp_fin_timeout 5
sysctl-set-value net.ipv4.ip_nonlocal_bind 1
sysctl-set-value net.ipv4.tcp_rmem "16384 65536 524288"
sysctl-set-value net.ipv4.tcp_wmem "16384 349520 699040"
sysctl-set-value net.ipv4.ip_local_port_range "1025 65534"
sysctl-write-value net.ipv4.tcp_fin_timeout 5
sysctl-write-value net.ipv4.ip_nonlocal_bind 1
sysctl-write-value net.ipv4.tcp_rmem "16384 65536 524288"
sysctl-write-value net.ipv4.tcp_wmem "16384 349520 699040"
sysctl-write-value net.ipv4.ip_local_port_range "1025 65534"

1
elements/keepalived-octavia-ubuntu/element-deps
View File

@ -1,3 +1,2 @@
os-svc-install
package-installs
pkg-map

1
elements/keepalived-octavia/element-deps
View File

@ -1,2 +1 @@
os-svc-install
package-installs