diff options
35 files changed, 1047 insertions, 94 deletions
@@ -81,7 +81,7 @@ function download_packages() for i in $CENTOS_BASE $COMPASS_CORE $COMPASS_WEB $COMPASS_INSTALL $TRUSTY_JUNO_PPA $TRUSTY_LIBERTY_PPA $TRUSTY_MITAKA_PPA \ $XENIAL_MITAKA_PPA $UBUNTU_ISO $UBUNTU_ISO1 $CENTOS_ISO $CENTOS7_JUNO_PPA $CENTOS7_KILO_PPA $CENTOS7_LIBERTY_PPA \ $CENTOS7_MITAKA_PPA $LOADERS $CIRROS $APP_PACKAGE $COMPASS_PKG \ - $PIP_REPO $ANSIBLE_MODULE; do + $PIP_REPO $ANSIBLE_MODULE $JH_ENV_PACKAGE; do if [[ ! $i ]]; then continue @@ -169,6 +169,8 @@ function copy_file() tar -zxvf $CACHE_DIR/`basename $PIP_REPO` -C $new/ + tar -zxvf $CACHE_DIR/`basename $JH_ENV_PACKAGE` -C $new/ + find $new/compass -name ".git" | xargs rm -rf } diff --git a/build/build.conf b/build/build.conf index c6e0f7a1..0723064f 100644 --- a/build/build.conf +++ b/build/build.conf @@ -14,6 +14,7 @@ export COMPASS_INSTALL=${COMPASS_INSTALL:-http://github.com/baigk/compass-instal # Compass core packages export COMPASS_PKG=${COMPASS_PKG:-$PACKAGE_URL/centos7-compass-core.tar.gz} export PIP_REPO=${PIP_REPO:-$PACKAGE_URL/pip.tar.gz} +export JH_ENV_PACKAGE=${JH_ENV_PACKAGE:-$PACKAGE_URL/jh_env_package.tar.gz} export ANSIBLE_MODULE=${ANSIBLE_MODULE:-https://github.com/openstack-ansible/openstack-ansible-modules.git} # OS ISO for provisioning diff --git a/build/jhenv_template/centos/rhel7/Dockerfile b/build/jhenv_template/centos/rhel7/Dockerfile new file mode 100644 index 00000000..a47360aa --- /dev/null +++ b/build/jhenv_template/centos/rhel7/Dockerfile @@ -0,0 +1,54 @@ +FROM centos:7.1.1503 +MAINTAINER Yifei Xue <xueyifei@huawei.com> + +ADD ./cp_env.sh /cp_env.sh + +#RUN yum provides '*/applydeltarpm' -y + +#RUN yum install deltarpm -y + +RUN yum remove -y systemd + +RUN yum update -y + +RUN yum install yum-plugin-downloadonly + +RUN mkdir -p /rpm + +RUN yum install -y epel-release-7-8 + +RUN yum groupinstall -y --downloadonly --downloaddir=/rpm 'Development Tools' + +RUN yum install -y --downloadonly --downloaddir=/rpm epel-release mkisofs bc curl ipmitool \ +git python-pip python-devel figlet \ +libxslt-devel libxml2-devel libvirt-devel \ +qemu qemu-kvm qemu-img virt-manager libvirt libvirt-python libvirt-client virt-install virt-viewer \ +guestfish libguestfs-tools virt-top mysql-devel \ +openssl-devel libffi libffi-devel python-cffi + +RUN yum install -y epel-release mkisofs bc curl ipmitool \ +git python-pip python-devel figlet \ +libxslt-devel libxml2-devel libvirt-devel \ +qemu qemu-kvm qemu-img virt-manager libvirt libvirt-python libvirt-client virt-install virt-viewer \ +guestfish libguestfs-tools virt-top mysql-devel \ +openssl-devel libffi libffi-devel python-cffi + +RUN yum install -y python-pip + +RUN yum install -y tar + +RUN tar -zcvf env_rel7_rpm.tar.gz /rpm + +RUN mkdir -p /home/pip + +RUN pip install --upgrade markupsafe virtualenv netaddr pbr oslo.config Cheetah ansible -d /home/pip/ + +RUN tar -zcvf env_rel7_pip.tar.gz /home/pip + +RUN mkdir -p /home/tmp + +RUN cp *.tar.gz /home/tmp + +RUN chmod +x /cp_env.sh + +CMD ["/cp_env.sh"] diff --git a/build/jhenv_template/ubuntu/trusty/Dockerfile b/build/jhenv_template/ubuntu/trusty/Dockerfile new file mode 100644 index 00000000..650d763c --- /dev/null +++ b/build/jhenv_template/ubuntu/trusty/Dockerfile @@ -0,0 +1,35 @@ +FROM ubuntu:14.04.3 +MAINTAINER Yifei Xue <xueyifei@huawei.com> + +ADD ./cp_env.sh /cp_env.sh + +RUN apt-get update + +RUN apt-get install -y -d mkisofs bc curl ipmitool openvswitch-switch \ +git python-pip python-dev figlet \ +libxslt-dev libxml2-dev libvirt-dev \ +build-essential qemu-utils qemu-kvm libvirt-bin \ +virtinst libmysqld-dev \ +libssl-dev libffi-dev python-cffi + +RUN mkdir jh_deb + +RUN cp /var/cache/apt/archives/*.deb jh_deb/ + +RUN tar -zcvf env_trusty_deb.tar.gz jh_deb/ + +RUN apt-get install -y python-pip + +RUN mkdir jh_pip + +RUN pip install --upgrade markupsafe virtualenv cheetah pyyaml requests netaddr pbr oslo.config ansible -d jh_pip/ + +RUN tar -zcvf env_trusty_pip.tar.gz jh_pip/ + +RUN mkdir -p /home/tmp + +RUN cp *.tar.gz /home/tmp + +RUN chmod +x /cp_env.sh + +CMD ["/cp_env.sh"] diff --git a/build/jhenv_template/ubuntu/xenial/Dockerfile b/build/jhenv_template/ubuntu/xenial/Dockerfile new file mode 100644 index 00000000..f70586ea --- /dev/null +++ b/build/jhenv_template/ubuntu/xenial/Dockerfile @@ -0,0 +1,35 @@ +FROM ubuntu:16.04 +MAINTAINER Yifei Xue <xueyifei@huawei.com> + +ADD ./cp_env.sh /cp_env.sh + +RUN apt-get update + +RUN apt-get install -y -d mkisofs bc curl ipmitool openvswitch-switch \ +git python-pip python-dev figlet \ +libxslt-dev libxml2-dev libvirt-dev \ +build-essential qemu-utils qemu-kvm libvirt-bin \ +virtinst libmysqld-dev \ +libssl-dev libffi-dev python-cffi + +RUN mkdir jh_deb + +RUN cp /var/cache/apt/archives/*.deb jh_deb/ + +RUN tar -zcvf env_xenial_deb.tar.gz jh_deb/ + +RUN apt-get install -y python-pip + +RUN mkdir jh_pip + +RUN pip install --upgrade markupsafe virtualenv cheetah pyyaml requests netaddr pbr oslo.config ansible -d jh_pip/ + +RUN tar -zcvf env_xenial_pip.tar.gz jh_pip/ + +RUN mkdir -p /home/tmp + +RUN cp *.tar.gz /home/tmp + +RUN chmod +x /cp_env.sh + +CMD ["/cp_env.sh"] diff --git a/build/make_repo.sh b/build/make_repo.sh index f38da7ff..f186c46c 100755 --- a/build/make_repo.sh +++ b/build/make_repo.sh @@ -33,6 +33,7 @@ set -ex cp /*.tar.gz /result -f EOF + sudo apt-get -f install sudo apt-get install python-yaml -y sudo apt-get install python-cheetah -y } @@ -42,7 +43,7 @@ function make_repo() rm -f ${WORK_PATH}/work/repo/install_packages.sh rm -f ${WORK_PATH}/work/repo/Dockerfile - option=`echo "os-ver:,package-tag:,tmpl:,default-package:, \ + option=`echo "os-ver:,jh-os:,package-tag:,tmpl:,default-package:, \ special-package:,special-package-script-dir:, \ special-package-dir:,ansible-dir:,special-package-dir" | sed 's/ //g'` @@ -53,6 +54,7 @@ function make_repo() eval set -- "$TEMP" os_ver="" + jh_os="" package_tag="" tmpl="" default_package="" @@ -64,6 +66,7 @@ function make_repo() while :; do case "$1" in --os-ver) os_ver=$2; shift 2;; + --jh-os) jh_os=$2; shift 2;; --package-tag) package_tag=$2; shift 2;; --tmpl) tmpl=$2; shift 2;; --default-package) default_package=$2; shift 2;; @@ -81,6 +84,11 @@ function make_repo() return fi + if [[ -n ${package_tag} && ${package_tag} == "jhenv" && -n ${jh_os} ]]; then + make_jhenv_repo + return + fi + if [[ -z ${os_ver} || -z ${package_tag} ]]; then echo "parameter is wrong" exit 1 @@ -267,8 +275,53 @@ function make_pip_repo() cd $WORK_PATH/work/repo; tar -zcvf pip.tar.gz ./pip; cd - } +function make_jhenv_repo() +{ + if [[ ${jh_os} == trusty ]]; then + env_os_name=ubuntu + fi + + if [[ ${jh_os} == xenial ]]; then + env_os_name=ubuntu + fi + + if [[ ${jh_os} =~ rhel[0-9]*$ ]]; then + env_os_name=centos + fi + + if [[ -d ${WORK_PATH}/build/jhenv_template/$env_os_name ]]; then + + jh_env_dockerfile=Dockerfile + jh_env_docker_tmpl=${BUILD_PATH}/jhenv_template/$env_os_name/$jh_os/${jh_env_dockerfile}".tmpl" + jh_env_docker_tag="$jh_os/env" + + rm -rf ${WORK_PATH}/work/repo/jhenv_template + mkdir ${WORK_PATH}/work/repo/jhenv_template + cp -rf ${WORK_PATH}/build/jhenv_template/$env_os_name/$jh_os/${jh_env_dockerfile} ${WORK_PATH}/work/repo/jhenv_template + +cat <<EOF >${WORK_PATH}/work/repo/jhenv_template/cp_env.sh +#!/bin/bash +set -ex +cp /*.tar.gz /env -f +EOF + + sudo docker build --no-cache=true -t ${jh_env_docker_tag} -f ${WORK_PATH}/work/repo/jhenv_template/${jh_env_dockerfile} ${WORK_PATH}/work/repo/jhenv_template + sudo docker run -t -v ${WORK_PATH}/work/repo:/env ${jh_env_docker_tag} + + image_id=$(sudo docker images|grep ${jh_env_docker_tag}|awk '{print $3}') + + sudo docker rmi -f ${image_id} + +# cd $WORK_PATH/work/repo; tar -zcvf pip.tar.gz ./pip; cd - + fi +} + function make_all_repo() { + for env_os in trusty xanial rhel7; do + make_repo --package-tag jhenv --jh-os $env_os + done + make_repo --package-tag pip make_repo --os-ver rhel7 --package-tag compass \ diff --git a/deploy/adapters/ansible/openstack/templates/neutron.conf b/deploy/adapters/ansible/openstack/templates/neutron.conf index ebc46f99..cbdd534d 100644 --- a/deploy/adapters/ansible/openstack/templates/neutron.conf +++ b/deploy/adapters/ansible/openstack/templates/neutron.conf @@ -307,7 +307,7 @@ notify_nova_on_port_data_changes = True nova_url = http://{{ internal_vip.ip }}:8774/v2 # Name of nova region to use. Useful if keystone manages more than one region -nova_region_name = regionOne +nova_region_name = RegionOne # Username for connection to nova in admin context nova_admin_username = nova diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/aodh.conf.j2 b/deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/aodh.conf.j2 index 743099cb..d4d232be 100644 --- a/deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/aodh.conf.j2 +++ b/deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/aodh.conf.j2 @@ -40,7 +40,7 @@ os_username = aodh os_tenant_name = service os_password = {{ AODH_PASS }} os_endpoint_type = internalURL -os_region_name = regionOne +os_region_name = RegionOne [api] host = {{ internal_ip }} diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/main.yml index 58751dfd..9e97a29c 100644 --- a/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/main.yml +++ b/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/main.yml @@ -14,7 +14,7 @@ services_noarch: [] os_services: - name: keystone type: identity - region: regionOne + region: RegionOne description: "OpenStack Identity" publicurl: "http://{{ public_vip.ip }}:5000/v2.0" internalurl: "http://{{ internal_vip.ip }}:5000/v2.0" @@ -22,7 +22,7 @@ os_services: - name: glance type: image - region: regionOne + region: RegionOne description: "OpenStack Image Service" publicurl: "http://{{ public_vip.ip }}:9292" internalurl: "http://{{ internal_vip.ip }}:9292" @@ -30,7 +30,7 @@ os_services: - name: nova type: compute - region: regionOne + region: RegionOne description: "OpenStack Compute" publicurl: "http://{{ public_vip.ip }}:8774/v2/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8774/v2/%(tenant_id)s" @@ -38,7 +38,7 @@ os_services: - name: neutron type: network - region: regionOne + region: RegionOne description: "OpenStack Networking" publicurl: "http://{{ public_vip.ip }}:9696" internalurl: "http://{{ internal_vip.ip }}:9696" @@ -46,7 +46,7 @@ os_services: - name: ceilometer type: metering - region: regionOne + region: RegionOne description: "OpenStack Telemetry" publicurl: "http://{{ public_vip.ip }}:8777" internalurl: "http://{{ internal_vip.ip }}:8777" @@ -54,7 +54,7 @@ os_services: - name: aodh type: alarming - region: regionOne + region: RegionOne description: "OpenStack Telemetry" publicurl: "http://{{ public_vip.ip }}:8042" internalurl: "http://{{ internal_vip.ip }}:8042" @@ -62,7 +62,7 @@ os_services: - name: cinder type: volume - region: regionOne + region: RegionOne description: "OpenStack Block Storage" publicurl: "http://{{ public_vip.ip }}:8776/v1/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8776/v1/%(tenant_id)s" @@ -70,7 +70,7 @@ os_services: - name: cinderv2 type: volumev2 - region: regionOne + region: RegionOne description: "OpenStack Block Storage v2" publicurl: "http://{{ public_vip.ip }}:8776/v2/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8776/v2/%(tenant_id)s" @@ -78,7 +78,7 @@ os_services: - name: heat type: orchestration - region: regionOne + region: RegionOne description: "OpenStack Orchestration" publicurl: "http://{{ public_vip.ip }}:8004/v1/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8004/v1/%(tenant_id)s" @@ -86,7 +86,7 @@ os_services: - name: heat-cfn type: cloudformation - region: regionOne + region: RegionOne description: "OpenStack CloudFormation Orchestration" publicurl: "http://{{ public_vip.ip }}:8000/v1" internalurl: "http://{{ internal_vip.ip }}:8000/v1" diff --git a/deploy/adapters/ansible/openstack_mitaka/templates/neutron.conf b/deploy/adapters/ansible/openstack_mitaka/templates/neutron.conf index 5e33d3f7..33231ed5 100644 --- a/deploy/adapters/ansible/openstack_mitaka/templates/neutron.conf +++ b/deploy/adapters/ansible/openstack_mitaka/templates/neutron.conf @@ -310,7 +310,7 @@ notify_nova_on_port_data_changes = True nova_url = http://{{ internal_vip.ip }}:8774/v2 # Name of nova region to use. Useful if keystone manages more than one region -nova_region_name = regionOne +nova_region_name = RegionOne # Username for connection to nova in admin context nova_admin_username = nova diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/templates/aodh.conf.j2 b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/templates/aodh.conf.j2 index 743099cb..d4d232be 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/templates/aodh.conf.j2 +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/templates/aodh.conf.j2 @@ -40,7 +40,7 @@ os_username = aodh os_tenant_name = service os_password = {{ AODH_PASS }} os_endpoint_type = internalURL -os_region_name = regionOne +os_region_name = RegionOne [api] host = {{ internal_ip }} diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml index 7a09378c..9ce499da 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml @@ -14,7 +14,7 @@ services_noarch: [] os_services: - name: keystone type: identity - region: regionOne + region: RegionOne description: "OpenStack Identity" publicurl: "http://{{ public_vip.ip }}:5000/v2.0" internalurl: "http://{{ internal_vip.ip }}:5000/v2.0" @@ -22,7 +22,7 @@ os_services: - name: glance type: image - region: regionOne + region: RegionOne description: "OpenStack Image Service" publicurl: "http://{{ public_vip.ip }}:9292" internalurl: "http://{{ internal_vip.ip }}:9292" @@ -30,7 +30,7 @@ os_services: - name: nova type: compute - region: regionOne + region: RegionOne description: "OpenStack Compute" publicurl: "http://{{ public_vip.ip }}:8774/v2/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8774/v2/%(tenant_id)s" @@ -38,7 +38,7 @@ os_services: - name: neutron type: network - region: regionOne + region: RegionOne description: "OpenStack Networking" publicurl: "http://{{ public_vip.ip }}:9696" internalurl: "http://{{ internal_vip.ip }}:9696" @@ -46,7 +46,7 @@ os_services: - name: ceilometer type: metering - region: regionOne + region: RegionOne description: "OpenStack Telemetry" publicurl: "http://{{ public_vip.ip }}:8777" internalurl: "http://{{ internal_vip.ip }}:8777" @@ -54,7 +54,7 @@ os_services: - name: aodh type: alarming - region: regionOne + region: RegionOne description: "OpenStack Telemetry" publicurl: "http://{{ public_vip.ip }}:8042" internalurl: "http://{{ internal_vip.ip }}:8042" @@ -62,7 +62,7 @@ os_services: - name: cinder type: volume - region: regionOne + region: RegionOne description: "OpenStack Block Storage" publicurl: "http://{{ public_vip.ip }}:8776/v1/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8776/v1/%(tenant_id)s" @@ -70,7 +70,7 @@ os_services: - name: cinderv2 type: volumev2 - region: regionOne + region: RegionOne description: "OpenStack Block Storage v2" publicurl: "http://{{ public_vip.ip }}:8776/v2/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8776/v2/%(tenant_id)s" @@ -78,7 +78,7 @@ os_services: - name: heat type: orchestration - region: regionOne + region: RegionOne description: "OpenStack Orchestration" publicurl: "http://{{ public_vip.ip }}:8004/v1/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8004/v1/%(tenant_id)s" @@ -86,7 +86,7 @@ os_services: - name: heat-cfn type: cloudformation - region: regionOne + region: RegionOne description: "OpenStack CloudFormation Orchestration" publicurl: "http://{{ public_vip.ip }}:8000/v1" internalurl: "http://{{ internal_vip.ip }}:8000/v1" @@ -94,7 +94,7 @@ os_services: - name: swift type: object-store - region: regionOne + region: RegionOne description: "OpenStack Object Storage" publicurl: "http://{{ public_vip.ip }}:8080/v1/AUTH_%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s" diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml index 9db404b9..aad55d05 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml @@ -14,7 +14,7 @@ services_noarch: [] os_services: - name: keystone type: identity - region: regionOne + region: RegionOne description: "OpenStack Identity" publicurl: "http://{{ public_vip.ip }}:5000/v2.0" internalurl: "http://{{ internal_vip.ip }}:5000/v2.0" @@ -22,7 +22,7 @@ os_services: - name: glance type: image - region: regionOne + region: RegionOne description: "OpenStack Image Service" publicurl: "http://{{ public_vip.ip }}:9292" internalurl: "http://{{ internal_vip.ip }}:9292" @@ -30,7 +30,7 @@ os_services: - name: nova type: compute - region: regionOne + region: RegionOne description: "OpenStack Compute" publicurl: "http://{{ public_vip.ip }}:8774/v2/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8774/v2/%(tenant_id)s" @@ -38,7 +38,7 @@ os_services: - name: neutron type: network - region: regionOne + region: RegionOne description: "OpenStack Networking" publicurl: "http://{{ public_vip.ip }}:9696" internalurl: "http://{{ internal_vip.ip }}:9696" @@ -46,7 +46,7 @@ os_services: - name: ceilometer type: metering - region: regionOne + region: RegionOne description: "OpenStack Telemetry" publicurl: "http://{{ public_vip.ip }}:8777" internalurl: "http://{{ internal_vip.ip }}:8777" @@ -54,7 +54,7 @@ os_services: - name: aodh type: alarming - region: regionOne + region: RegionOne description: "OpenStack Telemetry" publicurl: "http://{{ public_vip.ip }}:8042" internalurl: "http://{{ internal_vip.ip }}:8042" @@ -62,7 +62,7 @@ os_services: # - name: cinder # type: volume -# region: regionOne +# region: RegionOne # description: "OpenStack Block Storage" # publicurl: "http://{{ public_vip.ip }}:8776/v1/%(tenant_id)s" # internalurl: "http://{{ internal_vip.ip }}:8776/v1/%(tenant_id)s" @@ -70,7 +70,7 @@ os_services: # # - name: cinderv2 # type: volumev2 -# region: regionOne +# region: RegionOne # description: "OpenStack Block Storage v2" # publicurl: "http://{{ public_vip.ip }}:8776/v2/%(tenant_id)s" # internalurl: "http://{{ internal_vip.ip }}:8776/v2/%(tenant_id)s" @@ -78,7 +78,7 @@ os_services: - name: heat type: orchestration - region: regionOne + region: RegionOne description: "OpenStack Orchestration" publicurl: "http://{{ public_vip.ip }}:8004/v1/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8004/v1/%(tenant_id)s" @@ -86,7 +86,7 @@ os_services: - name: heat-cfn type: cloudformation - region: regionOne + region: RegionOne description: "OpenStack CloudFormation Orchestration" publicurl: "http://{{ public_vip.ip }}:8000/v1" internalurl: "http://{{ internal_vip.ip }}:8000/v1" @@ -94,7 +94,7 @@ os_services: - name: swift type: object-store - region: regionOne + region: RegionOne description: "OpenStack Object Storage" publicurl: "http://{{ public_vip.ip }}:8080/v1/AUTH_%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s" diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/templates/neutron.conf b/deploy/adapters/ansible/openstack_mitaka_xenial/templates/neutron.conf index 5e33d3f7..33231ed5 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/templates/neutron.conf +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/templates/neutron.conf @@ -310,7 +310,7 @@ notify_nova_on_port_data_changes = True nova_url = http://{{ internal_vip.ip }}:8774/v2 # Name of nova region to use. Useful if keystone manages more than one region -nova_region_name = regionOne +nova_region_name = RegionOne # Username for connection to nova in admin context nova_admin_username = nova diff --git a/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2 b/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2 index ee78de01..275c991a 100644 --- a/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2 +++ b/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2 @@ -27,5 +27,5 @@ os_username = ceilometer os_tenant_name = service os_password = {{ CEILOMETER_PASS }} os_endpoint_type = internalURL -os_region_name = regionOne +os_region_name = RegionOne diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2 b/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2 index b262a26b..d0cadeaa 100644 --- a/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2 +++ b/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2 @@ -28,7 +28,7 @@ os_username = ceilometer os_tenant_name = service os_password = {{ CEILOMETER_PASS }} os_endpoint_type = internalURL -os_region_name = regionOne +os_region_name = RegionOne [publisher] metering_secret = {{ metering_secret }} diff --git a/deploy/adapters/ansible/roles/keystone/vars/main.yml b/deploy/adapters/ansible/roles/keystone/vars/main.yml index 9a7312e9..c6725da6 100644 --- a/deploy/adapters/ansible/roles/keystone/vars/main.yml +++ b/deploy/adapters/ansible/roles/keystone/vars/main.yml @@ -14,7 +14,7 @@ services_noarch: [] os_services: - name: keystone type: identity - region: regionOne + region: RegionOne description: "OpenStack Identity" publicurl: "http://{{ public_vip.ip }}:5000/v2.0" internalurl: "http://{{ internal_vip.ip }}:5000/v2.0" @@ -22,7 +22,7 @@ os_services: - name: glance type: image - region: regionOne + region: RegionOne description: "OpenStack Image Service" publicurl: "http://{{ public_vip.ip }}:9292" internalurl: "http://{{ internal_vip.ip }}:9292" @@ -30,7 +30,7 @@ os_services: - name: nova type: compute - region: regionOne + region: RegionOne description: "OpenStack Compute" publicurl: "http://{{ public_vip.ip }}:8774/v2/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8774/v2/%(tenant_id)s" @@ -38,7 +38,7 @@ os_services: - name: neutron type: network - region: regionOne + region: RegionOne description: "OpenStack Networking" publicurl: "http://{{ public_vip.ip }}:9696" internalurl: "http://{{ internal_vip.ip }}:9696" @@ -46,7 +46,7 @@ os_services: - name: ceilometer type: metering - region: regionOne + region: RegionOne description: "OpenStack Telemetry" publicurl: "http://{{ public_vip.ip }}:8777" internalurl: "http://{{ internal_vip.ip }}:8777" @@ -54,7 +54,7 @@ os_services: - name: cinder type: volume - region: regionOne + region: RegionOne description: "OpenStack Block Storage" publicurl: "http://{{ public_vip.ip }}:8776/v1/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8776/v1/%(tenant_id)s" @@ -62,7 +62,7 @@ os_services: - name: cinderv2 type: volumev2 - region: regionOne + region: RegionOne description: "OpenStack Block Storage v2" publicurl: "http://{{ public_vip.ip }}:8776/v2/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8776/v2/%(tenant_id)s" @@ -70,7 +70,7 @@ os_services: - name: heat type: orchestration - region: regionOne + region: RegionOne description: "OpenStack Orchestration" publicurl: "http://{{ public_vip.ip }}:8004/v1/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8004/v1/%(tenant_id)s" @@ -78,7 +78,7 @@ os_services: - name: heat-cfn type: cloudformation - region: regionOne + region: RegionOne description: "OpenStack CloudFormation Orchestration" publicurl: "http://{{ public_vip.ip }}:8000/v1" internalurl: "http://{{ internal_vip.ip }}:8000/v1" diff --git a/deploy/adapters/ansible/roles/neutron-compute/templates/metadata_agent.ini b/deploy/adapters/ansible/roles/neutron-compute/templates/metadata_agent.ini index 87937cc7..5109d8b7 100644 --- a/deploy/adapters/ansible/roles/neutron-compute/templates/metadata_agent.ini +++ b/deploy/adapters/ansible/roles/neutron-compute/templates/metadata_agent.ini @@ -4,7 +4,7 @@ debug = True # The Neutron user information for accessing the Neutron API. auth_url = http://{{ internal_vip.ip }}:5000/v2.0 -auth_region = regionOne +auth_region = RegionOne # Turn off verification of the certificate for ssl # auth_insecure = False # Certificate Authority public key (CA cert) file for ssl diff --git a/deploy/adapters/ansible/roles/neutron-controller/templates/metadata_agent.ini b/deploy/adapters/ansible/roles/neutron-controller/templates/metadata_agent.ini index 87937cc7..5109d8b7 100644 --- a/deploy/adapters/ansible/roles/neutron-controller/templates/metadata_agent.ini +++ b/deploy/adapters/ansible/roles/neutron-controller/templates/metadata_agent.ini @@ -4,7 +4,7 @@ debug = True # The Neutron user information for accessing the Neutron API. auth_url = http://{{ internal_vip.ip }}:5000/v2.0 -auth_region = regionOne +auth_region = RegionOne # Turn off verification of the certificate for ssl # auth_insecure = False # Certificate Authority public key (CA cert) file for ssl diff --git a/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini b/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini index 87937cc7..5109d8b7 100644 --- a/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini +++ b/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini @@ -4,7 +4,7 @@ debug = True # The Neutron user information for accessing the Neutron API. auth_url = http://{{ internal_vip.ip }}:5000/v2.0 -auth_region = regionOne +auth_region = RegionOne # Turn off verification of the certificate for ssl # auth_insecure = False # Certificate Authority public key (CA cert) file for ssl diff --git a/deploy/adapters/ansible/roles/nova-controller/templates/metadata_agent.ini b/deploy/adapters/ansible/roles/nova-controller/templates/metadata_agent.ini index 87937cc7..5109d8b7 100644 --- a/deploy/adapters/ansible/roles/nova-controller/templates/metadata_agent.ini +++ b/deploy/adapters/ansible/roles/nova-controller/templates/metadata_agent.ini @@ -4,7 +4,7 @@ debug = True # The Neutron user information for accessing the Neutron API. auth_url = http://{{ internal_vip.ip }}:5000/v2.0 -auth_region = regionOne +auth_region = RegionOne # Turn off verification of the certificate for ssl # auth_insecure = False # Certificate Authority public key (CA cert) file for ssl diff --git a/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml b/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml index 35f896dc..564b5506 100755 --- a/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml +++ b/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml @@ -76,7 +76,7 @@ - name: provide an endpoint to tacker service shell: > - . /opt/admin-openrc.sh; openstack endpoint create --region regionOne \ + . /opt/admin-openrc.sh; openstack endpoint create --region RegionOne \ --publicurl 'http://{{ public_vip.ip }}:8888/' \ --adminurl 'http://{{ internal_vip.ip }}:8888/' \ --internalurl 'http://{{ internal_vip.ip }}:8888/' tacker diff --git a/deploy/conf/hardware_environment/huawei-pod5/network.yml b/deploy/conf/hardware_environment/huawei-pod5/network.yml new file mode 100644 index 00000000..dbaba01c --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/network.yml @@ -0,0 +1,90 @@ +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 125 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 126 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.16.1.1" + - "172.16.1.254" + cidr: "172.16.1.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.16.2.1" + - "172.16.2.254" + cidr: "172.16.2.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "10.145.140.100" + - "10.145.140.105" + cidr: "10.145.140.0/24" + gw: "10.145.140.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 10.145.140.115 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: True + network: ext-net + type: flat + segment_id: 1000 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: False + no_gateway: False + external_gw: "10.145.140.1" + floating_ip_cidr: "10.145.140.0/24" + floating_ip_start: "10.145.140.100" + floating_ip_end: "10.145.140.200" diff --git a/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml b/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml new file mode 100644 index 00000000..b15ce35a --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml @@ -0,0 +1,90 @@ +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 125 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 126 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.16.1.1" + - "172.16.1.254" + cidr: "172.16.1.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.16.2.1" + - "172.16.2.254" + cidr: "172.16.2.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "10.145.140.100" + - "10.145.140.105" + cidr: "10.145.140.0/24" + gw: "10.145.140.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 10.145.140.115 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: True + network: ext-net + type: flat + segment_id: 1000 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: False + no_gateway: False + external_gw: "100.100.100.1" + floating_ip_cidr: "100.100.100.0/24" + floating_ip_start: "100.100.100.30" + floating_ip_end: "100.100.100.120" diff --git a/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml b/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml new file mode 100644 index 00000000..6c543b48 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml @@ -0,0 +1,90 @@ +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 125 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 126 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.16.1.1" + - "172.16.1.254" + cidr: "172.16.1.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.16.2.1" + - "172.16.2.254" + cidr: "172.16.2.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "10.145.140.100" + - "10.145.140.105" + cidr: "10.145.140.0/24" + gw: "10.145.140.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 10.145.140.115 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: True + network: ext-net + type: vxlan + segment_id: 1000 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: False + no_gateway: False + external_gw: "10.145.140.1" + floating_ip_cidr: "10.145.140.0/24" + floating_ip_start: "10.145.140.100" + floating_ip_end: "10.145.140.200" diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml new file mode 100644 index 00000000..56428daa --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml @@ -0,0 +1,63 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +hosts: + - name: host1 + mac: '70:7b:e8:75:71:d3' + interfaces: + - eth1: '70:7b:e8:75:71:d2' + ipmiIp: 172.31.123.2 + ipmiPass: root + roles: + - controller + - ha + - ceph-adm + - ceph-mon + + - name: host2 + mac: '70:7b:e8:75:72:21' + interfaces: + - eth1: '70:7b:e8:75:72:20' + ipmiIp: 172.31.123.3 + ipmiPass: root + roles: + - controller + - ha + - ceph-mon + + - name: host3 + mac: '70:7b:e8:75:71:37' + interfaces: + - eth1: '70:7b:e8:75:71:36' + ipmiIp: 172.31.123.4 + ipmiPass: root + roles: + - controller + - ha + - ceph-mon + + - name: host4 + mac: '70:7b:e8:75:71:dc' + interfaces: + - eth1: '70:7b:e8:75:71:db' + ipmiIp: 172.31.123.5 + ipmiPass: root + roles: + - compute + - ceph-osd + + - name: host5 + mac: '70:7b:e8:75:71:d6' + interfaces: + - eth1: '70:7b:e8:75:71:d5' + ipmiIp: 172.31.123.6 + ipmiPass: root + roles: + - compute + - ceph-osd + diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml new file mode 100644 index 00000000..65f31383 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml @@ -0,0 +1,62 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +hosts: + - name: host1 + mac: '70:7b:e8:75:71:d3' + interfaces: + - eth1: '70:7b:e8:75:71:d2' + ipmiIp: 172.31.123.2 + ipmiPass: root + roles: + - controller + - ha + - opencontrail + - ceph-adm + - ceph-mon + + - name: host2 + mac: '70:7b:e8:75:72:21' + interfaces: + - eth1: '70:7b:e8:75:72:20' + ipmiIp: 172.31.123.3 + ipmiPass: root + roles: + - compute + - ceph-osd + + - name: host3 + mac: '70:7b:e8:75:71:37' + interfaces: + - eth1: '70:7b:e8:75:71:36' + ipmiIp: 172.31.123.4 + ipmiPass: root + roles: + - compute + - ceph-osd + + - name: host4 + mac: '70:7b:e8:75:71:dc' + interfaces: + - eth1: '70:7b:e8:75:71:db' + ipmiIp: 172.31.123.5 + ipmiPass: root + roles: + - compute + - ceph-osd + + - name: host5 + mac: '70:7b:e8:75:71:d6' + interfaces: + - eth1: '70:7b:e8:75:71:d5' + ipmiIp: 172.31.123.6 + ipmiPass: root + roles: + - compute + - ceph-osd + diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml new file mode 100644 index 00000000..e19937ec --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml @@ -0,0 +1,68 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +moon: "Enable" + +hosts: + - name: host1 + mac: '70:7b:e8:75:71:d3' + interfaces: + - eth1: '70:7b:e8:75:71:d2' + ipmiIp: 172.31.123.2 + ipmiPass: root + roles: + - controller + - ha + - odl + - ceph-adm + - ceph-mon + + - name: host2 + mac: '70:7b:e8:75:72:21' + interfaces: + - eth1: '70:7b:e8:75:72:20' + ipmiIp: 172.31.123.3 + ipmiPass: root + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host3 + mac: '70:7b:e8:75:71:37' + interfaces: + - eth1: '70:7b:e8:75:71:36' + ipmiIp: 172.31.123.4 + ipmiPass: root + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host4 + mac: '70:7b:e8:75:71:dc' + interfaces: + - eth1: '70:7b:e8:75:71:db' + ipmiIp: 172.31.123.5 + ipmiPass: root + roles: + - compute + - ceph-osd + + - name: host5 + mac: '70:7b:e8:75:71:d6' + interfaces: + - eth1: '70:7b:e8:75:71:d5' + ipmiIp: 172.31.123.6 + ipmiPass: root + roles: + - compute + - ceph-osd + diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml new file mode 100644 index 00000000..3b01d83d --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml @@ -0,0 +1,66 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +hosts: + - name: host1 + mac: '70:7b:e8:75:71:d3' + interfaces: + - eth1: '70:7b:e8:75:71:d2' + ipmiIp: 172.31.123.2 + ipmiPass: root + roles: + - controller + - ha + - odl + - ceph-adm + - ceph-mon + + - name: host2 + mac: '70:7b:e8:75:72:21' + interfaces: + - eth1: '70:7b:e8:75:72:20' + ipmiIp: 172.31.123.3 + ipmiPass: root + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host3 + mac: '70:7b:e8:75:71:37' + interfaces: + - eth1: '70:7b:e8:75:71:36' + ipmiIp: 172.31.123.4 + ipmiPass: root + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host4 + mac: '70:7b:e8:75:71:dc' + interfaces: + - eth1: '70:7b:e8:75:71:db' + ipmiIp: 172.31.123.5 + ipmiPass: root + roles: + - compute + - ceph-osd + + - name: host5 + mac: '70:7b:e8:75:71:d6' + interfaces: + - eth1: '70:7b:e8:75:71:d5' + ipmiIp: 172.31.123.6 + ipmiPass: root + roles: + - compute + - ceph-osd + diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml new file mode 100644 index 00000000..dbc261a0 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml @@ -0,0 +1,68 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +odl_l3_agent: "Enable" + +hosts: + - name: host1 + mac: '70:7b:e8:75:71:d3' + interfaces: + - eth1: '70:7b:e8:75:71:d2' + ipmiIp: 172.31.123.2 + ipmiPass: root + roles: + - controller + - ha + - odl + - ceph-adm + - ceph-mon + + - name: host2 + mac: '70:7b:e8:75:72:21' + interfaces: + - eth1: '70:7b:e8:75:72:20' + ipmiIp: 172.31.123.3 + ipmiPass: root + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host3 + mac: '70:7b:e8:75:71:37' + interfaces: + - eth1: '70:7b:e8:75:71:36' + ipmiIp: 172.31.123.4 + ipmiPass: root + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host4 + mac: '70:7b:e8:75:71:dc' + interfaces: + - eth1: '70:7b:e8:75:71:db' + ipmiIp: 172.31.123.5 + ipmiPass: root + roles: + - compute + - ceph-osd + + - name: host5 + mac: '70:7b:e8:75:71:d6' + interfaces: + - eth1: '70:7b:e8:75:71:d5' + ipmiIp: 172.31.123.6 + ipmiPass: root + roles: + - compute + - ceph-osd + diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml new file mode 100644 index 00000000..cff1bcf2 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml @@ -0,0 +1,66 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +hosts: + - name: host1 + mac: '70:7b:e8:75:71:d3' + interfaces: + - eth1: '70:7b:e8:75:71:d2' + ipmiIp: 172.31.123.2 + ipmiPass: root + roles: + - controller + - ha + - onos + - ceph-adm + - ceph-mon + + - name: host2 + mac: '70:7b:e8:75:72:21' + interfaces: + - eth1: '70:7b:e8:75:72:20' + ipmiIp: 172.31.123.3 + ipmiPass: root + roles: + - controller + - ha + - onos + - ceph-mon + + - name: host3 + mac: '70:7b:e8:75:71:37' + interfaces: + - eth1: '70:7b:e8:75:71:36' + ipmiIp: 172.31.123.4 + ipmiPass: root + roles: + - controller + - ha + - onos + - ceph-mon + + - name: host4 + mac: '70:7b:e8:75:71:dc' + interfaces: + - eth1: '70:7b:e8:75:71:db' + ipmiIp: 172.31.123.5 + ipmiPass: root + roles: + - compute + - ceph-osd + + - name: host5 + mac: '70:7b:e8:75:71:d6' + interfaces: + - eth1: '70:7b:e8:75:71:d5' + ipmiIp: 172.31.123.6 + ipmiPass: root + roles: + - compute + - ceph-osd + diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml new file mode 100644 index 00000000..435d4481 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml @@ -0,0 +1,68 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +onos_sfc: "Enable" + +hosts: + - name: host1 + mac: '70:7b:e8:75:71:d3' + interfaces: + - eth1: '70:7b:e8:75:71:d2' + ipmiIp: 172.31.123.2 + ipmiPass: root + roles: + - controller + - ha + - onos + - ceph-adm + - ceph-mon + + - name: host2 + mac: '70:7b:e8:75:72:21' + interfaces: + - eth1: '70:7b:e8:75:72:20' + ipmiIp: 172.31.123.3 + ipmiPass: root + roles: + - controller + - ha + - onos + - ceph-mon + + - name: host3 + mac: '70:7b:e8:75:71:37' + interfaces: + - eth1: '70:7b:e8:75:71:36' + ipmiIp: 172.31.123.4 + ipmiPass: root + roles: + - controller + - ha + - onos + - ceph-mon + + - name: host4 + mac: '70:7b:e8:75:71:dc' + interfaces: + - eth1: '70:7b:e8:75:71:db' + ipmiIp: 172.31.123.5 + ipmiPass: root + roles: + - compute + - ceph-osd + + - name: host5 + mac: '70:7b:e8:75:71:d6' + interfaces: + - eth1: '70:7b:e8:75:71:d5' + ipmiIp: 172.31.123.6 + ipmiPass: root + roles: + - compute + - ceph-osd + diff --git a/deploy/launch.sh b/deploy/launch.sh index 488e0fd7..2c272c79 100755 --- a/deploy/launch.sh +++ b/deploy/launch.sh @@ -15,7 +15,6 @@ mkdir -p $WORK_DIR/script export DEPLOY_FIRST_TIME=${DEPLOY_FIRST_TIME-"true"} source ${COMPASS_DIR}/deploy/prepare.sh -prepare_python_env source ${COMPASS_DIR}/util/log.sh source ${COMPASS_DIR}/deploy/deploy_parameter.sh source $(process_input_para $*) || exit 1 @@ -30,6 +29,16 @@ source ${COMPASS_DIR}/deploy/compass_vm.sh source ${COMPASS_DIR}/deploy/deploy_host.sh ######################### main process +download_iso +pre_prepare +prepare_env +if [[ "$DEPLOY_COMPASS" == "true" ]]; then + if ! prepare_python_env;then + echo "prepare_python_env failed" + exit 1 + fi +fi + print_logo if [[ ! -z $VIRT_NUMBER ]];then @@ -46,11 +55,6 @@ fi export machines if [[ "$DEPLOY_COMPASS" == "true" ]]; then - if ! prepare_env;then - echo "prepare_env failed" - exit 1 - fi - log_info "########## set up network begin #############" if ! create_nets;then log_error "create_nets failed" diff --git a/deploy/prepare.sh b/deploy/prepare.sh index a4f606af..7d7a02d5 100755 --- a/deploy/prepare.sh +++ b/deploy/prepare.sh @@ -9,11 +9,11 @@ ############################################################################## function print_logo() { - if ! apt --installed list 2>/dev/null | grep "figlet" - then - sudo apt-get update -y - sudo apt-get install -y --force-yes figlet - fi +# if ! apt --installed list 2>/dev/null | grep "figlet" +# then +# sudo apt-get update -y +# sudo apt-get install -y --force-yes figlet +# fi figlet -ctf slant Compass Installer set +x; sleep 2; set -x @@ -32,32 +32,19 @@ function download_iso() fi fi + rm -rf $WORK_DIR/iso + mkdir -p $WORK_DIR/iso + mkdir -p $WORK_DIR/cache curl --connect-timeout 10 -o $WORK_DIR/cache/$iso_name $ISO_URL -} -function prepare_env() { - if [[ "$DEPLOY_FIRST_TIME" == "true" ]]; then - sudo apt-get update -y - sudo apt-get install -y --force-yes mkisofs bc curl ipmitool openvswitch-switch - sudo apt-get install -y --force-yes git python-dev - sudo apt-get install -y --force-yes libxslt-dev libxml2-dev libvirt-dev build-essential qemu-utils qemu-kvm libvirt-bin virtinst libmysqld-dev - sudo apt-get install -y --force-yes libffi-dev libssl-dev - fi - - sudo service libvirt-bin restart - if sudo service openvswitch-switch status|grep stop; then - sudo service openvswitch-switch start - fi +} +function pre_prepare() { # prepare work dir - rm -rf $WORK_DIR/{installer,vm,network,iso} + rm -rf $WORK_DIR/{installer,vm,network} mkdir -p $WORK_DIR/installer mkdir -p $WORK_DIR/vm mkdir -p $WORK_DIR/network - mkdir -p $WORK_DIR/iso - mkdir -p $WORK_DIR/cache - - download_iso cp $WORK_DIR/cache/`basename $ISO_URL` $WORK_DIR/iso/centos.iso -f @@ -72,24 +59,65 @@ function prepare_env() { chmod 755 $WORK_DIR -R sudo cp ${COMPASS_DIR}/deploy/qemu_hook.sh /etc/libvirt/hooks/qemu + + rm -rf $WORK_DIR/cache/compass_tmp + mkdir -p $WORK_DIR/cache/compass_tmp + rm -rf $WORK_DIR/cache/jh_env_tmp + mkdir -p $WORK_DIR/cache/jh_env_tmp + sudo mount -o loop $WORK_DIR/cache/$iso_name $WORK_DIR/cache/compass_tmp/ + cp $WORK_DIR/cache/compass_tmp/jh_env_package/*.tar.gz $WORK_DIR/cache/jh_env_tmp/ + sudo umount $WORK_DIR/cache/compass_tmp/ + rm -rf $WORK_DIR/cache/compass_tmp + tar -zxvf $WORK_DIR/cache/jh_env_tmp/env_trusty_deb.tar.gz -C $WORK_DIR/cache/jh_env_tmp + tar -zxvf $WORK_DIR/cache/jh_env_tmp/env_trusty_pip.tar.gz -C $WORK_DIR/cache/jh_env_tmp +} + +function prepare_env() { + if [[ "$DEPLOY_FIRST_TIME" == "true" ]]; then + cd $WORK_DIR/cache/jh_env_tmp/jh_deb + dpkg -i *.deb + cd - + fi } function _prepare_python_env() { rm -rf $WORK_DIR/venv mkdir -p $WORK_DIR/venv - sudo apt-get install -y --force-yes python-pip - sudo pip install --upgrade virtualenv + rm -rf ~/.pip + mkdir -p ~/.pip + cd $WORK_DIR/cache/jh_env_tmp/ + +cat <<EOF > ~/.pip/pip.conf +[global] +find-links = http://127.0.0.1:9999/jh_pip +no-index = true +[install] +trusted-host=127.0.0.1 +EOF + + nohup python -m SimpleHTTPServer 9999 & + + cd - + virtualenv $WORK_DIR/venv source $WORK_DIR/venv/bin/activate - pip install --upgrade pip - pip install --upgrade cheetah - pip install --upgrade pyyaml - pip install --upgrade requests - pip install --upgrade netaddr - pip install --upgrade oslo.config - pip install --upgrade ansible + PIP="markupsafe virtualenv cheetah pyyaml requests netaddr pbr oslo.config ansible" + for i in ${PIP}; do + pip install --upgrade $i + done + service libvirt-bin restart + if sudo service openvswitch-switch status|grep stop; then + sudo service openvswitch-switch start + fi + + pid=$(ps -ef | grep SimpleHTTPServer | grep 9999 | awk '{print $2}') + echo $pid + kill -9 $pid + + rm -rf ~/.pip/pip.conf + rm -rf $WORK_DIR/cache/jh_env_tmp } function prepare_python_env() diff --git a/docs/FAQ/how-to-deploy-while-jumphost-cannot-access-internet.rst b/docs/FAQ/how-to-deploy-while-jumphost-cannot-access-internet.rst new file mode 100644 index 00000000..37db1aed --- /dev/null +++ b/docs/FAQ/how-to-deploy-while-jumphost-cannot-access-internet.rst @@ -0,0 +1,10 @@ +.. two dots create a comment. please leave this logo at the top of each of your rst files. + +How to deploy while jumphost cannot access internet +=================================================== + +If your jumphost cannot access internet, don't worry, you can definitely deploy compass without internet access. + +You can download compass.iso first from OPNFV artifacts repository (http://artifacts.opnfv.org/, search compass4nfv and select an appropriate ISO file) via wget or curl. Then copy the compass.iso and the compass4nfv repository to your jumphost and editor the ISO_URL to your local path. + +After that you can deploy compass without internet access. |