diff options
| author |   Stepan Andrushko <stepanx.andrushko@intel.com> | 2018-03-16 20:53:06 +0200 |
|---|---|---|
| committer | Stepan Andrushko <stepanx.andrushko@intel.com> | 2018-04-26 11:43:07 +0300 |
| commit | 7cf8184eca909dc4d4cddff38ae457ab7e01f053 (patch) | |
| tree | 0a493065fe7ff3da22819986a981b45b0c86d664 /tools | |
| parent | e937764091fbb568e285a506582bbcc36fdb051a (diff) | |
OpenStack deployment using kolla
OpenStack deployment using Kolla installer for all-in-one mode and
multinode inside VMs which are already created. Two types of OpenStack
nodes are supported as input in sample files, like
infra_deploy_two.yaml.sample: controller and compute.
JIRA: YARDSTICK-1078
Change-Id: I51616a7a17ac565a01ec6da57b589290237d18ee
Signed-off-by: Stepan Andrushko <stepanx.andrushko@intel.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/virt_ci_rampup.sh | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/tools/virt_ci_rampup.sh b/tools/virt_ci_rampup.sh index d9aa23c22..aaf162cf7 100755 --- a/tools/virt_ci_rampup.sh +++ b/tools/virt_ci_rampup.sh @@ -13,9 +13,33 @@ # See the License for the specific language governing permissions and # limitations under the License. +env_http_proxy=$(sed -ne "s/^http_proxy=[\"\']\(.*\)[\"\']/\1/p" /etc/environment) +if [[ -z ${http_proxy} ]] && [[ ! -z ${env_http_proxy} ]]; then + export http_proxy=${env_http_proxy} +fi +env_https_proxy=$(sed -ne "s/^https_proxy=[\"\']\(.*\)[\"\']/\1/p" /etc/environment) +if [[ -z ${https_proxy} ]] && [[ ! -z ${env_https_proxy} ]]; then + export https_proxy=${env_https_proxy} +fi +env_ftp_proxy=$(sed -ne "s/^ftp_proxy=[\"\']\(.*\)[\"\']/\1/p" /etc/environment) +if [[ -z ${ftp_proxy} ]] && [[ ! -z ${env_ftp_proxy} ]]; then + export ftp_proxy=${env_ftp_proxy} +fi +if [[ ! -z ${http_proxy} ]] || [[ ! -z ${https_proxy} ]]; then + export no_proxy="${no_proxy}" + extra_args="${extra_args} -e @/tmp/proxy.yml " + cat <<EOF > /tmp/proxy.yml +--- +proxy_env: + http_proxy: ${http_proxy} + https_proxy: ${https_proxy} + ftp_proxy: ${ftp_proxy} + no_proxy: ${no_proxy} +EOF +fi ANSIBLE_SCRIPTS="${0%/*}/../ansible" cd ${ANSIBLE_SCRIPTS} && \ sudo -EH ansible-playbook \ - -e RS_FILE='../etc/infra/infra_deploy.yaml' -e CLEAN_UP=False \ + -e RS_FILE='../etc/infra/infra_deploy_two.yaml' -e CLEAN_UP=False ${extra_args} \ -i inventory.ini infra_deploy.yml |