Change-Id: Ie7854a7a0554b3ce117c73d76fb23199ed3f11b8
Signed-off-by: Sam Hague <shague@redhat.com>
sudo chmod 777 /opt/stack
cd /opt/stack
git clone https://git.openstack.org/openstack-dev/devstack --branch $OPENSTACK_BRANCH
sudo chmod 777 /opt/stack
cd /opt/stack
git clone https://git.openstack.org/openstack-dev/devstack --branch $OPENSTACK_BRANCH
-EOF
-
-#Work around for pike stacking failure by avoiding recently merged changes
-# Currently reset to state as in 01-Sep-2017
-#ToDo Need to get rid of this sooner
-if [ "${OPENSTACK_BRANCH}" == "stable/pike" ]; then # Pike
-cat >> ${WORKSPACE}/get_devstack.sh << EOF
-git reset --hard c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65
-EOF
+if [ -n "${DEVSTACK_HASH}" ]; then
+ git checkout ${DEVSTACK_HASH}
+git --no-pager log --pretty=format:'%h %<(13)%ar%<(13)%cr %<(20,trunc)%an%d %s\n%b' -n20
+EOF
cat > "${WORKSPACE}/setup_host_cell_mapping.sh" << EOF
sudo nova-manage cell_v2 map_cell0
cat > "${WORKSPACE}/setup_host_cell_mapping.sh" << EOF
sudo nova-manage cell_v2 map_cell0
create_etc_hosts ${!CONTROLIP}
scp ${WORKSPACE}/hosts_file ${!CONTROLIP}:/tmp/hosts
scp ${WORKSPACE}/get_devstack.sh ${!CONTROLIP}:/tmp
create_etc_hosts ${!CONTROLIP}
scp ${WORKSPACE}/hosts_file ${!CONTROLIP}:/tmp/hosts
scp ${WORKSPACE}/get_devstack.sh ${!CONTROLIP}:/tmp
- ${SSH} ${!CONTROLIP} "bash /tmp/get_devstack.sh"
+ ${SSH} ${!CONTROLIP} "bash /tmp/get_devstack.sh > /tmp/get_devstack.sh.txt 2>&1"
create_control_node_local_conf ${!CONTROLIP} ${ODLMGRIP[$i]} "${ODL_OVS_MGRS[$i]}"
scp ${WORKSPACE}/local.conf_control_${!CONTROLIP} ${!CONTROLIP}:/opt/stack/devstack/local.conf
ssh ${!CONTROLIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
create_control_node_local_conf ${!CONTROLIP} ${ODLMGRIP[$i]} "${ODL_OVS_MGRS[$i]}"
scp ${WORKSPACE}/local.conf_control_${!CONTROLIP} ${!CONTROLIP}:/opt/stack/devstack/local.conf
ssh ${!CONTROLIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
create_etc_hosts ${!COMPUTEIP} ${!CONTROLIP}
scp ${WORKSPACE}/hosts_file ${!COMPUTEIP}:/tmp/hosts
scp ${WORKSPACE}/get_devstack.sh ${!COMPUTEIP}:/tmp
create_etc_hosts ${!COMPUTEIP} ${!CONTROLIP}
scp ${WORKSPACE}/hosts_file ${!COMPUTEIP}:/tmp/hosts
scp ${WORKSPACE}/get_devstack.sh ${!COMPUTEIP}:/tmp
- ${SSH} ${!COMPUTEIP} "bash /tmp/get_devstack.sh"
+ ${SSH} ${!COMPUTEIP} "bash /tmp/get_devstack.sh > /tmp/get_devstack.sh.txt 2>&1"
create_compute_node_local_conf ${!COMPUTEIP} ${!CONTROLIP} ${ODLMGRIP[$SITE_INDEX]} "${ODL_OVS_MGRS[$SITE_INDEX]}"
scp ${WORKSPACE}/local.conf_compute_${!COMPUTEIP} ${!COMPUTEIP}:/opt/stack/devstack/local.conf
ssh ${!COMPUTEIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
create_compute_node_local_conf ${!COMPUTEIP} ${!CONTROLIP} ${ODLMGRIP[$SITE_INDEX]} "${ODL_OVS_MGRS[$SITE_INDEX]}"
scp ${WORKSPACE}/local.conf_compute_${!COMPUTEIP} ${!COMPUTEIP}:/opt/stack/devstack/local.conf
ssh ${!COMPUTEIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
name: OPENSTACK_BRANCH
default: '{openstack-branch}'
description: 'Openstack version to use with devstack'
name: OPENSTACK_BRANCH
default: '{openstack-branch}'
description: 'Openstack version to use with devstack'
+ - string:
+ name: DEVSTACK_HASH
+ default: '{devstack-hash}'
+ description: 'devstack hash to checkout'
- string:
name: ODL_ML2_DRIVER_REPO
default: '{odl-ml2-driver-repo}'
- string:
name: ODL_ML2_DRIVER_REPO
default: '{odl-ml2-driver-repo}'
name: OPENSTACK_BRANCH
default: '{openstack-branch}'
description: 'Openstack version to use with devstack'
name: OPENSTACK_BRANCH
default: '{openstack-branch}'
description: 'Openstack version to use with devstack'
+ - string:
+ name: DEVSTACK_HASH
+ default: '{devstack-hash}'
+ description: 'devstack hash to checkout'
- string:
name: ODL_ML2_DRIVER_REPO
default: '{odl-ml2-driver-repo}'
- string:
name: ODL_ML2_DRIVER_REPO
default: '{odl-ml2-driver-repo}'
openstack:
- pike:
openstack-branch: 'stable/pike'
openstack:
- pike:
openstack-branch: 'stable/pike'
+ devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
odl-ml2-branch: 'stable/pike'
odl-ml2-driver-version: 'v2'
odl-ml2-port-binding: 'pseudo-agentdb-binding'
odl-ml2-branch: 'stable/pike'
odl-ml2-driver-version: 'v2'
odl-ml2-port-binding: 'pseudo-agentdb-binding'
openstack:
- pike:
openstack-branch: 'stable/pike'
openstack:
- pike:
openstack-branch: 'stable/pike'
+ devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
odl-ml2-branch: 'stable/pike'
odl-ml2-driver-version: 'v2'
odl-ml2-port-binding: 'pseudo-agentdb-binding'
odl-ml2-branch: 'stable/pike'
odl-ml2-driver-version: 'v2'
odl-ml2-port-binding: 'pseudo-agentdb-binding'
openstack_system2_image: 'CentOS 7 - devstack-newton - 20170707-0359'
- pike:
openstack-branch: 'stable/pike'
openstack_system2_image: 'CentOS 7 - devstack-newton - 20170707-0359'
- pike:
openstack-branch: 'stable/pike'
+ devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
odl-ml2-branch: 'stable/pike'
odl-ml2-driver-version: 'v2'
odl-ml2-port-binding: 'pseudo-agentdb-binding'
odl-ml2-branch: 'stable/pike'
odl-ml2-driver-version: 'v2'
odl-ml2-port-binding: 'pseudo-agentdb-binding'
lftools-version: <1.0.0
# defaults for parameters installing openstack for csit jobs
lftools-version: <1.0.0
# defaults for parameters installing openstack for csit jobs
create-initial-networks: 'False'
disable-odl-l3-service-plugin: 'no'
disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
create-initial-networks: 'False'
disable-odl-l3-service-plugin: 'no'
disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'