Added scripts for container build and aim ctrl

Author: Mandeep Dhami

tripleo-ciscoaci/files/build_ciscoaci_containers.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+set -eu
+
+# Parse Args
+script=$(basename "$0")
+action=${1:-''}
+if [ "${action}" != 'start' -a "${action}" != 'stop' -a "${action}" != 'status' ] ; then
+    echo "USAGE: ${script} <action> (where action is one of start, stop, or status)"
+    echo "Invalid argument: '${action}'" 1>&2
+    exit 1
+fi
+
+# check for correct openstack env, will exit if env is not set
+echo "Validating overcloud env ..."
+nova list 3>/dev/null 2>&1 1>&3
+
+# get list of controllers
+echo "Finding an available overcloud server ..."
+ocloud_server_str=$(openstack server list -f json 2>/dev/null | jq .[0].Networks 2>/dev/null)
+if [ "${ocloud_server_str}" != "null" ] ; then
+    echo "Using overcloud server from: ${ocloud_server_str}"
+    ocloud_server=$(echo ${ocloud_server_str} | tr -d '"' | cut -d= -f2)
+    echo "Finding all overcloud controllers ..."
+    ocloud_ctrls_str=$(ssh -q -o 'UserKnownHostsFile /dev/null' -o 'StrictHostKeyChecking no' \
+        heat-admin@${ocloud_server} sudo cat /etc/puppet/hieradata/all_nodes.json | \
+        jq .controller_node_ips)
+    if [ "${ocloud_ctrls_str}" != "null" ] ; then
+        echo "Using overcloud ctrls from: ${ocloud_ctrls_str}"
+        ocloud_ctrls_list=$(echo ${ocloud_ctrls_str} | tr -d '"')
+        for ctrl in $(echo ${ocloud_ctrls_list} | tr ',' '\n') ; do
+            echo "Overcloud controller: ${ctrl} ..."
+            ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \
+                heat-admin@${ctrl} \
+                "sudo systemctl ${action} aim-event-service-rpc; \
+                 sudo systemctl ${action} aim-aid; \
+                 sudo systemctl ${action} aim-event-service-polling" ;
+        done
+    else
+        echo "No overcloud controller found." 1>&2
+        exit 3
+    fi
+else
+    echo "No overcloud controller found" 1>&2
+    exit 2
+fi

tripleo-ciscoaci/files/ciscoaci_aim.sh

@@ -0,0 +1,94 @@
+#!/bin/bash
+set -eu
+
+# Process Args, use defaults for common case
+CISCOACI_YAML=${1:-'/home/stack/templates/cisco_containers.yaml'}
+CISCOACI_RPMDIR=${2:-'/var/www/html/acirepo'}
+SCRIPT_NAME=$(basename $0)
+
+# functions to build images
+function build_tag_push() {
+    CONTAINER_DIR=$1
+    CONTAINER_NAME=$2
+    (
+        cd ${CONTAINER_DIR}
+        sudo docker build ./ -t ${CISCOACI_TAG}
+        IMAGE_ID=`sudo docker images -q ${CISCOACI_TAG}`
+        sudo docker tag ${IMAGE_ID} ${LOCAL_REGISTRY_ADDRESS}/${CONTAINER_NAME}:${CISCOACI_TAG}
+        sudo docker push ${LOCAL_REGISTRY_ADDRESS}/${CONTAINER_NAME}:${CISCOACI_TAG}
+    )
+}
+
+function build_heat_engine_image() {
+    # create the build dir
+    CONTAINER_BUILD_DIR=$(mktemp -d /tmp/ciscoaci_XXXX)
+    cp ${CISCOACI_RPMDIR}/openstack-heat-gbp-*.rpm ${CONTAINER_BUILD_DIR}
+    cp ${CISCOACI_RPMDIR}/python-gbpclient-*.rpm ${CONTAINER_BUILD_DIR}
+    cat > ${CONTAINER_BUILD_DIR}/Dockerfile <<EOF
+        FROM registry.access.redhat.com/rhosp12/openstack-heat-engine:${UPSTREAM_TAG}
+        MAINTAINER Cisco Systems
+        LABEL name="rhosp12/openstack-heat-engine-ciscoaci" vendor="Cisco Systems" version="12.0" release="1"
+        USER root
+        COPY openstack-heat-gbp-*.rpm /tmp
+        COPY python-gbpclient-*.rpm /tmp
+        RUN rpm -ihv /tmp/*.rpm --nodeps
+        RUN mkdir -p /usr/lib/heat
+        RUN cp -r /usr/lib/python2.7/site-packages/gbpautomation /usr/lib/heat
+EOF
+
+    # build, tag and push latest build image and push to local registry
+    build_tag_push ${CONTAINER_BUILD_DIR} openstack-heat-engine-ciscoaci
+    rm -rf ${CONTAINER_BUILD_DIR}
+}
+
+function build_horizon_image() {
+    # create the build dir
+    CONTAINER_BUILD_DIR=$(mktemp -d /tmp/ciscoaci_XXXX)
+    cp ${CISCOACI_RPMDIR}/openstack-dashboard-gbp-*.rpm ${CONTAINER_BUILD_DIR}
+    cp ${CISCOACI_RPMDIR}/python-django-horizon-gbp-*.rpm ${CONTAINER_BUILD_DIR}
+    cp ${CISCOACI_RPMDIR}/python-gbpclient-*.rpm ${CONTAINER_BUILD_DIR}
+    cat > ${CONTAINER_BUILD_DIR}/Dockerfile <<EOF
+        FROM registry.access.redhat.com/rhosp12/openstack-horizon:${UPSTREAM_TAG}
+        MAINTAINER Cisco Systems
+        LABEL name="rhosp12/openstack-horizon-ciscoaci" vendor="Cisco Systems" version="12.0" release="1"
+        USER root
+        COPY openstack-dashboard-gbp-*.rpm /tmp
+        COPY python-django-horizon-gbp-*.rpm /tmp
+        COPY python-gbpclient-*.rpm /tmp
+        RUN rpm -ivh /tmp/*.rpm
+        RUN cp /usr/share/openstack-dashboard/openstack_dashboard/enabled/_*gbp* /usr/lib/python2.7/site-packages/openstack_dashboard/local/enabled
+EOF
+
+    # build, tag and push latest build image and push to local registry
+    build_tag_push ${CONTAINER_BUILD_DIR} openstack-horizon-ciscoaci
+    rm -rf ${CONTAINER_BUILD_DIR}
+}
+
+function create_cisco_yaml() {
+    cat > ${CISCOACI_YAML} <<EOF
+parameter_defaults:
+   DockerHorizonImage: ${LOCAL_REGISTRY_ADDRESS}/openstack-horizon-ciscoaci:${CISCOACI_TAG}
+   DockerHeatEngineImage: ${LOCAL_REGISTRY_ADDRESS}/openstack-heat-engine-ciscoaci:${CISCOACI_TAG}
+EOF
+}
+
+# main()
+echo ""
+echo "Running as: ${SCRIPT_NAME} ${CISCOACI_YAML} ${CISCOACI_RPMDIR}"
+echo ""
+
+# Local variables
+LOCAL_REGISTRY_ADDRESS=$(docker images | grep -v redhat.com | grep -o '^.*rhosp12' | sort -u)
+UPSTREAM_TAG=$(sudo openstack overcloud container image tag discover \
+    --image registry.access.redhat.com/rhosp12/openstack-base:latest \
+    --tag-from-label version-release)
+CISCOACI_TAG=${UPSTREAM_TAG}
+
+build_horizon_image
+build_heat_engine_image
+create_cisco_yaml
+
+echo ""
+echo "Created Openstack director env file: ${CISCOACI_YAML}"
+echo "Please include '${CISCOACI_YAML}' as the last env file when deploying OSD"
+echo ""