diff options
| -rwxr-xr-x | ci/deploy/deploy.sh | 16 | ||||
| -rwxr-xr-x | ci/kolla-build-vm.sh | 16 | ||||
| -rw-r--r-- | ci/kolla_patches/0000-kolla-odl-ovsdpdk.patch | 88 | ||||
| -rwxr-xr-x | code/install_interface_patch.sh | 2 | ||||
| -rwxr-xr-x | code/makefile_patch.sh | 2 | ||||
| -rwxr-xr-x | deploy/check_openstack_progress.sh | 6 | ||||
| -rw-r--r-- | deploy/config/bm_environment/zte-baremetal1/deploy.yml | 60 | ||||
| -rw-r--r-- | deploy/config/vm_environment/zte-virtual1/deploy.yml | 40 | ||||
| -rw-r--r-- | deploy/config/vm_environment/zte-virtual2/deploy.yml | 12 | ||||
| -rwxr-xr-x | deploy/get_conf.py | 6 |
10 files changed, 167 insertions, 81 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index e34e4f99..8fbc172f 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -187,11 +187,7 @@ function update_dha_by_pdf() local pdf_yaml=labs/$LAB_NAME/${POD_NAME}.yaml local pod_template=config/installers/daisy/pod_config.yaml.j2 local generate_config=config/utils/generate_config.py - if [[ $DEPLOY_SCENARIO =~ (dpdk) ]]; then - local network_template=config/installers/daisy/network-dpdk.yaml.j2 - else - local network_template=config/installers/daisy/network.yaml.j2 - fi + local network_template=config/installers/daisy/network.yaml.j2 if [ ! -f ${generate_config} ] || [ ! -f ${pdf_yaml} ] || [ ! -f ${pod_template} ] || [ ! -f ${network_template} ] ; then echo "Template files donot exist in ${SECURELABDIR}." return @@ -212,6 +208,7 @@ function update_dha_by_pdf() rm $tmpfile return fi + test -d $(dirname ${DHA_CONF}) || mkdir -p $(dirname ${DHA_CONF}) cp ${tmpfile} ${DHA_CONF} echo "====== Update deploy.yml from POD Descriptor File ======" @@ -220,6 +217,7 @@ function update_dha_by_pdf() echo "Cannot generate network configuration from PDF and IDF!" return fi + test -d $(dirname ${NETWORK_CONF}) || mkdir -p $(dirname ${NETWORK_CONF}) cp ${tmpfile} ${NETWORK_CONF} echo "====== Update $(basename ${NETWORK_CONF}) from POD Descriptor File ======" rm -f $tmpfile @@ -488,20 +486,20 @@ function get_mac_addresses_for_virtual() name=${VM_MULTINODE[$i]} macs=$(virsh dumpxml $name | grep "<mac" | awk -F "'" '{print $2}' | tr "\n" " ") line=$(awk "BEGIN{}(/name/&&/$name/){print NR}" $tmpfile) - sed -i "${line}a\ mac_addresses:" $tmpfile + sed -i "${line}a\ mac_addresses:" $tmpfile for mac in $macs; do line=$[ line + 1 ] - sed -i "${line}a\ - \'$mac\'" $tmpfile + sed -i "${line}a\ - \'$mac\'" $tmpfile done done else name="all_in_one" macs=$(virsh dumpxml $name | grep "<mac" | awk -F "'" '{print $2}' | tr "\n" " ") line=$(awk "BEGIN{}(/name/&&/$name/){print NR}" $tmpfile) - sed -i "${line}a\ mac_addresses:" $tmpfile + sed -i "${line}a\ mac_addresses:" $tmpfile for mac in $macs; do line=$[ line + 1 ] - sed -i "${line}a\ - \'$mac\'" $tmpfile + sed -i "${line}a\ - \'$mac\'" $tmpfile done fi diff --git a/ci/kolla-build-vm.sh b/ci/kolla-build-vm.sh index 011537ad..48a84894 100755 --- a/ci/kolla-build-vm.sh +++ b/ci/kolla-build-vm.sh @@ -13,7 +13,6 @@ set -o errexit set -o nounset set -o pipefail -KOLLA_GIT="https://github.com/huzhijiang/kolla.git" KOLLA_BRANCH="stable/ocata" OPNFV_JOB_NAME= KOLLA_TAG= @@ -37,7 +36,6 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx usage: `basename $0` [options] OPTIONS: - -l Kolla git repo location -b Kolla git repo branch -j OPNFV job name -t Kolla git repo code tag(base version of image) @@ -45,8 +43,7 @@ OPTIONS: -w working directroy Examples: -sudo `basename $0` -l https://git.openstack.org/openstack/kolla - -b stable/ocata +sudo `basename $0` -b stable/ocata -j daisy-docker-build-euphrates -t 4.0.2 -e .1 @@ -55,12 +52,9 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx EOF } -while getopts "l:b:j:t:e:w:h" OPTION +while getopts "b:j:t:e:w:h" OPTION do case $OPTION in - l) - KOLLA_GIT=${OPTARG} - ;; b) KOLLA_BRANCH=${OPTARG} ;; @@ -259,7 +253,7 @@ function update_kolla_code { mkdir -p $KOLLA_GIT_DIR pushd $KOLLA_GIT_DIR - git clone $KOLLA_GIT + git clone https://git.openstack.org/openstack/kolla pushd $KOLLA_GIT_DIR/kolla git checkout $KOLLA_BRANCH @@ -267,6 +261,10 @@ function update_kolla_code { git checkout $KOLLA_TAG fi + # Apply patches for openstack/kolla project + cp $WORKSPACE/ci/kolla_patches/*.patch ./ + git apply *.patch + KOLLA_GIT_VERSION=$(git log -1 --pretty="%H") tox -e genconfig KOLLA_IMAGE_VERSION=$(cat $KOLLA_GIT_DIR/kolla/etc/kolla/kolla-build.conf \ diff --git a/ci/kolla_patches/0000-kolla-odl-ovsdpdk.patch b/ci/kolla_patches/0000-kolla-odl-ovsdpdk.patch new file mode 100644 index 00000000..6504d998 --- /dev/null +++ b/ci/kolla_patches/0000-kolla-odl-ovsdpdk.patch @@ -0,0 +1,88 @@ +diff --git a/contrib/template-override/ovs-dpdk.j2 b/contrib/template-override/ovs-dpdk.j2 +index 7dea1b7..2bc6c5e 100644 +--- a/contrib/template-override/ovs-dpdk.j2 ++++ b/contrib/template-override/ovs-dpdk.j2 +@@ -46,6 +46,9 @@ + + {{ macros.install_packages(ovs_dpdk_packages | customizable("packages")) }} + ++RUN mkdir -p /lib/modules/$(uname -r) ++RUN ln -s /usr/src/kernels/$(uname -r) /lib/modules/$(uname -r)/build ++ + ADD plugins-archive / + RUN ln -s /plugins/ovsdpdk-plugin-ovs-archive-*/ /ovs \ + && ln -s /plugins/ovsdpdk-plugin-dpdk-archive-*/ /dpdk +@@ -64,7 +67,7 @@ WORKDIR "/dpdk/build" + "s/CONFIG_RTE_BUILD_SHARED_LIB=.*$/CONFIG_RTE_BUILD_SHARED_LIB=n/"]) + }} + +-RUN make -j $(nproc) EXTRA_CFLAGS='-O2 -fPIC' \ ++RUN make -j $(nproc) EXTRA_CFLAGS='-O2 -fPIC -Wno-maybe-uninitialized' \ + && make install + WORKDIR /ovs + RUN ./boot.sh \ +diff --git a/docker/base/grafana.repo b/docker/base/grafana.repo +index dc8d30b..58fee69 100644 +--- a/docker/base/grafana.repo ++++ b/docker/base/grafana.repo +@@ -2,6 +2,6 @@ + name=grafana + baseurl=https://packagecloud.io/grafana/stable/el/7/$basearch + repo_gpgcheck=1 +-enabled=1 ++enabled=0 + gpgcheck=1 + gpgkey=https://packagecloud.io/gpg.key https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana +diff --git a/docker/base/opendaylight.repo b/docker/base/opendaylight.repo +index 8c0c299..a78b119 100644 +--- a/docker/base/opendaylight.repo ++++ b/docker/base/opendaylight.repo +@@ -1,5 +1,5 @@ + [opendaylight] + name=CentOS CBS OpenDaylight Release Repository +-baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-6-release/x86_64/os/ ++baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-6-candidate/x86_64/os/ + enabled=1 + gpgcheck=0 +diff --git a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 b/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 +deleted file mode 100644 +index a43d3d7..0000000 +--- a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 ++++ /dev/null +@@ -1,36 +0,0 @@ +-FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} +-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +- +-{% block neutron_bgp_dragent_header %}{% endblock %} +- +-{% import "macros.j2" as macros with context %} +- +-{% if install_type == 'binary' %} +- {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} +-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ +- && /bin/false +- {% elif base_distro in ['ubuntu', 'debian'] %} +- {% set neutron_bgp_dragent_packages = [ +- 'neutron-bgp-dragent' +- ] %} +- {% endif %} +- +-{{ macros.install_packages(neutron_bgp_dragent_packages | customizable("packages")) }} +- +-{% elif install_type == 'source' %} +- +-ADD neutron-bgp-dragent-archive /neutron-bgp-dragent-source +- +- {% set neutron_bgp_dragent_pip_packages = [ +- '/neutron_dynamic_routing' +- ] %} +- +-RUN ln -s neutron-bgp-dragent-source/* neutron_dynamic_routing \ +- && {{ macros.install_pip(neutron_bgp_dragent_pip_packages | customizable("pip_packages")) }} +- +-{% endif %} +- +-{% block neutron_bgp_dragent_footer %}{% endblock %} +-{% block footer %}{% endblock %} +- +-USER neutron diff --git a/code/install_interface_patch.sh b/code/install_interface_patch.sh index 70aef47f..a2d13776 100755 --- a/code/install_interface_patch.sh +++ b/code/install_interface_patch.sh @@ -9,7 +9,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## imagebranch="pike" -imageversion="171226232545" +imageversion="180113131526" imageserver="http://artifacts.opnfv.org/daisy/upstream" imagedir="/var/lib/daisy/versionfile/kolla" imagename="kolla-image-$imagebranch-$imageversion.tgz" diff --git a/code/makefile_patch.sh b/code/makefile_patch.sh index 53242f91..e9ed9e4a 100755 --- a/code/makefile_patch.sh +++ b/code/makefile_patch.sh @@ -13,7 +13,7 @@ TOOLS_PATH=$1 CACHE_PATH=/home/cache imagebranch="pike" -imageversion="171226232545" +imageversion="180113131526" imageserver="http://artifacts.opnfv.org/daisy/upstream" imagename="kolla-image-$imagebranch-$imageversion.tgz" diff --git a/deploy/check_openstack_progress.sh b/deploy/check_openstack_progress.sh index 1aa3570a..ea7819a5 100755 --- a/deploy/check_openstack_progress.sh +++ b/deploy/check_openstack_progress.sh @@ -79,8 +79,8 @@ while true; do count=$[count + 1] # get 'Role_status' column - openstack_install_active=`daisy host-list --cluster-id $cluster_id | awk -F "|" '{print $13}' | grep -c "active" ` - openstack_install_failed=`daisy host-list --cluster-id $cluster_id | awk -F "|" '{print $13}' | grep -c "install-failed" ` + openstack_install_active=`daisy host-list --cluster-id $cluster_id | awk -F "|" '{print $14}' | grep -c "active" ` + openstack_install_failed=`daisy host-list --cluster-id $cluster_id | awk -F "|" '{print $14}' | grep -c "install-failed" ` if [ $openstack_install_active -eq $hosts_num ]; then echo "openstack installation succeded ..." break @@ -90,7 +90,7 @@ while true; do exit 1 else # get 'Role_progress' column - progress=`daisy host-list --cluster-id $cluster_id |grep DISCOVERY_SUCCESSFUL |awk -F "|" '{print $12}'|sed s/[[:space:]]//g|sed ':a;N;$ s/\n/ /g;ba'` + progress=`daisy host-list --cluster-id $cluster_id |grep DISCOVERY_SUCCESSFUL |awk -F "|" '{print $13}'|sed s/[[:space:]]//g|sed ':a;N;$ s/\n/ /g;ba'` echo " openstack in installing , progress of each node is $progress%" sleep 30 fi diff --git a/deploy/config/bm_environment/zte-baremetal1/deploy.yml b/deploy/config/bm_environment/zte-baremetal1/deploy.yml index 0c147280..620dd5f4 100644 --- a/deploy/config/bm_environment/zte-baremetal1/deploy.yml +++ b/deploy/config/bm_environment/zte-baremetal1/deploy.yml @@ -1,35 +1,35 @@ adapter: 'ipmi' hosts: -- name: 'controller01' - roles: - - 'CONTROLLER_LB' - ipmi_ip: '192.168.1.106' - ipmi_user: 'testuser' - ipmi_pass: 'testpass' -- name: 'controller02' - roles: - - 'CONTROLLER_LB' - ipmi_ip: '192.168.1.107' - ipmi_user: 'testuser' - ipmi_pass: 'testpass' -- name: 'controller03' - roles: - - 'CONTROLLER_LB' - ipmi_ip: '192.168.1.108' - ipmi_user: 'testuser' - ipmi_pass: 'testpass' -- name: 'computer01' - roles: - - 'COMPUTER' - ipmi_ip: '192.168.1.109' - ipmi_user: 'testuser' - ipmi_pass: 'testpass' -- name: 'computer02' - roles: - - 'COMPUTER' - ipmi_ip: '192.168.1.110' - ipmi_user: 'testuser' - ipmi_pass: 'testpass' + - name: 'controller01' + roles: + - 'CONTROLLER_LB' + ipmi_ip: '192.168.1.106' + ipmi_user: 'testuser' + ipmi_pass: 'testpass' + - name: 'controller02' + roles: + - 'CONTROLLER_LB' + ipmi_ip: '192.168.1.107' + ipmi_user: 'testuser' + ipmi_pass: 'testpass' + - name: 'controller03' + roles: + - 'CONTROLLER_LB' + ipmi_ip: '192.168.1.108' + ipmi_user: 'testuser' + ipmi_pass: 'testpass' + - name: 'computer01' + roles: + - 'COMPUTER' + ipmi_ip: '192.168.1.109' + ipmi_user: 'testuser' + ipmi_pass: 'testpass' + - name: 'computer02' + roles: + - 'COMPUTER' + ipmi_ip: '192.168.1.110' + ipmi_user: 'testuser' + ipmi_pass: 'testpass' disks: daisy: 50 daisy_passwd: 'r00tme' diff --git a/deploy/config/vm_environment/zte-virtual1/deploy.yml b/deploy/config/vm_environment/zte-virtual1/deploy.yml index e80d0310..e17214cf 100644 --- a/deploy/config/vm_environment/zte-virtual1/deploy.yml +++ b/deploy/config/vm_environment/zte-virtual1/deploy.yml @@ -1,25 +1,25 @@ adapter: libvirt hosts: -- name: 'controller01' - roles: - - 'CONTROLLER_LB' - template: 'templates/virtual_environment/vms/controller.xml' -- name: 'controller02' - roles: - - 'CONTROLLER_LB' - template: 'templates/virtual_environment/vms/controller.xml' -- name: 'controller03' - roles: - - 'CONTROLLER_LB' - template: 'templates/virtual_environment/vms/controller.xml' -- name: 'computer01' - roles: - - 'COMPUTER' - template: 'templates/virtual_environment/vms/computer.xml' -- name: 'computer02' - roles: - - 'COMPUTER' - template: 'templates/virtual_environment/vms/computer.xml' + - name: 'controller01' + roles: + - 'CONTROLLER_LB' + template: 'templates/virtual_environment/vms/controller.xml' + - name: 'controller02' + roles: + - 'CONTROLLER_LB' + template: 'templates/virtual_environment/vms/controller.xml' + - name: 'controller03' + roles: + - 'CONTROLLER_LB' + template: 'templates/virtual_environment/vms/controller.xml' + - name: 'computer01' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' + - name: 'computer02' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' disks: daisy: 50 controller: 110 diff --git a/deploy/config/vm_environment/zte-virtual2/deploy.yml b/deploy/config/vm_environment/zte-virtual2/deploy.yml index d4c99e97..c6c7d238 100644 --- a/deploy/config/vm_environment/zte-virtual2/deploy.yml +++ b/deploy/config/vm_environment/zte-virtual2/deploy.yml @@ -1,10 +1,10 @@ adapter: libvirt hosts: -- name: 'all_in_one' - roles: - - 'CONTROLLER_LB' - - 'COMPUTER' - template: 'templates/virtual_environment/vms/all_in_one.xml' + - name: 'all_in_one' + roles: + - 'CONTROLLER_LB' + - 'COMPUTER' + template: 'templates/virtual_environment/vms/all_in_one.xml' disks: daisy: 50 controller: 110 @@ -12,4 +12,4 @@ disks: daisy_passwd: 'r00tme' daisy_ip: '10.20.11.2' daisy_gateway: '10.20.11.1' -ceph_disk_name: ''
\ No newline at end of file +ceph_disk_name: '' diff --git a/deploy/get_conf.py b/deploy/get_conf.py index 97d2feba..bd72aabb 100755 --- a/deploy/get_conf.py +++ b/deploy/get_conf.py @@ -125,6 +125,8 @@ def get_yml_para(dha_file): controller_node_size = disks.get("controller", 0) compute_node_size = disks.get("compute", 0) daisy_passwd = data.get("daisy_passwd", "") + if not daisy_passwd: + daisy_passwd = "r00tme" daisy_ip = data.get("daisy_ip", "") daisy_gateway = data.get("daisy_gateway", "") daisy_target_node = data.get("hosts", "") @@ -140,9 +142,9 @@ def get_conf_from_deploy(): daisyserver_size, controller_node_size, compute_node_size,\ daisy_passwd, daisy_ip, daisy_gateway,\ hosts_num = get_yml_para(conf['dha']) - print "{hosts_num} {ip} {passwd} -s {size} -g {gateway}".format( + print "{hosts_num} {ip} {daisy_passwd} -s {size} -g {gateway}".format( hosts_num=hosts_num, - passwd=daisy_passwd, + daisy_passwd=daisy_passwd, size=daisyserver_size, ip=daisy_ip, gateway=daisy_gateway) |