diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index 0453d22e..c21b1422 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -88,7 +88,7 @@ hasp_tools_rpm_version: tsg_os_clixon_rpm_version: cligen: cligen-5.8.0-release clixon: clixon-5.8.0-release - tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.2.14.43430f7 + tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.2.15.54708cf sce_rpm_version: sce: sce-1.2.7.b4e0025 diff --git a/ansible/roles/patches-9000-NPB/files/install.sh b/ansible/roles/patches-9000-NPB/files/install.sh index a7885c0c..1e68f65b 100644 --- a/ansible/roles/patches-9000-NPB/files/install.sh +++ b/ansible/roles/patches-9000-NPB/files/install.sh @@ -43,10 +43,6 @@ function install_patch_files() mkdir -p /usr/lib/systemd/system/tsg-clixon-backend.service.d cp $UNARCHIVE_DIR/service_add_prestart.conf /usr/lib/systemd/system/tsg-clixon-backend.service.d/service_add_prestart.conf - mkdir -p /opt/tsg/clixon/bin - cp $UNARCHIVE_DIR/set_9000_NPB_running_db.sh /opt/tsg/clixon/bin/set_9000_NPB_running_db.sh - chmod 0755 /opt/tsg/clixon/bin/set_9000_NPB_running_db.sh - mkdir -p /opt/tsg/clixon/yang cp /opt/tsg/clixon/deviation/tsg-os-mgnt-augment-9000-NPB.yang /opt/tsg/clixon/yang/tsg-os-mgnt-augment-9000-NPB.yang } diff --git a/ansible/roles/patches-9000-NPB/files/patch/set_9000_NPB_running_db.sh b/ansible/roles/patches-9000-NPB/files/patch/set_9000_NPB_running_db.sh deleted file mode 100644 index 7d50a15c..00000000 --- a/ansible/roles/patches-9000-NPB/files/patch/set_9000_NPB_running_db.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -RUNNING_DB_FILE="/etc/clixon/running_db" -NETWORK_IN_RUNNING_DB= - -SLOT_ID= - -read_slot_id() -{ - output=$(ipmitool picmg addrinfo) - substr=${output:22:1} - SLOT_ID=$((16#${substr}+16)) -} - -add_network_into_running_db() -{ - local network=" - - eth_pf_smbio - endpoint -
10.252.${SLOT_ID}.1/16
-
- - eth_vf_mirr - endpoint - - - service_1 - virtual-wire - eth_pf_smbio - - - yes - eth_vf_mirr - -
" - #xmlstarlet ed --omit-decl -s "/config" -t text -n '' -v "$(xmlstarlet sel -t -c '/config/*' 2.xml)" 1.xml | xmlstarlet unesc | xmlstarlet fo --omit-decl > 3.xml - #$network | xmlstarlet sel -t -c '/config/*' - xml_content=$(xmlstarlet ed -s "/config" -t text -n '' -v "${network}" ${RUNNING_DB_FILE} | xmlstarlet unesc) - echo ${xml_content} | xmlstarlet fo > ${RUNNING_DB_FILE} - sed -i '//d' ${RUNNING_DB_FILE} -} - -is_network_in_running_db() -{ - ret=$(xmlstarlet sel -N ns="urn:yang:tsg-os-mgnt-srv" -t -v "count(/config/ns:network)" ${RUNNING_DB_FILE}) - if [ "${ret}" == "0" ]; then - NETWORK_IN_RUNNING_DB="false" - else - NETWORK_IN_RUNNING_DB="true" - fi -} - -delete_running_db_network() -{ - if [ "${NETWORK_IN_RUNNING_DB}" == "true" ]; then - xmlstarlet ed --omit-decl -L -N ns="urn:yang:tsg-os-mgnt-srv" -d "/config/ns:network" ${RUNNING_DB_FILE} - fi -} -read_slot_id -is_network_in_running_db -delete_running_db_network -add_network_into_running_db