openstack/instack-undercloud
Code Issues Proposed changes

Merge branch 'stable/icehouse'

Browse Source 
Conflicts:
	scripts/instack-build-images
This commit is contained in:
James Slagle 2014-08-11 16:06:17 -04:00
commit fe70aa5b32
6 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/selinux-package-updates/install.d/00-update-selinux-policy-packages
View File

@ -1,4 +0,0 @@
#!/bin/bash
set -eux
sudo yum -y install https://kojipkgs.fedoraproject.org//packages/selinux-policy/3.12.1/175.fc20/noarch/selinux-policy-3.12.1-175.fc20.noarch.rpm https://kojipkgs.fedoraproject.org//packages/selinux-policy/3.12.1/175.fc20/noarch/selinux-policy-targeted-3.12.1-175.fc20.noarch.rpm

9
elements/swift-package-updates/install.d/00-update-swift-packages
View File

@ -1,9 +0,0 @@
#!/bin/bash
set -eux
sudo yum -y install https://kojipkgs.fedoraproject.org//packages/openstack-swift/1.13.1/4.fc21/noarch/openstack-swift-1.13.1-4.fc21.noarch.rpm
sudo yum -y install https://kojipkgs.fedoraproject.org//packages/openstack-swift/1.13.1/4.fc21/noarch/openstack-swift-account-1.13.1-4.fc21.noarch.rpm
sudo yum -y install https://kojipkgs.fedoraproject.org//packages/openstack-swift/1.13.1/4.fc21/noarch/openstack-swift-container-1.13.1-4.fc21.noarch.rpm
sudo yum -y install https://kojipkgs.fedoraproject.org//packages/openstack-swift/1.13.1/4.fc21/noarch/openstack-swift-doc-1.13.1-4.fc21.noarch.rpm
sudo yum -y install https://kojipkgs.fedoraproject.org//packages/openstack-swift/1.13.1/4.fc21/noarch/openstack-swift-object-1.13.1-4.fc21.noarch.rpm
sudo yum -y install https://kojipkgs.fedoraproject.org//packages/openstack-swift/1.13.1/4.fc21/noarch/openstack-swift-proxy-1.13.1-4.fc21.noarch.rpm

17
instack-undercloud.spec
View File

@ -1,5 +1,5 @@
Name: instack-undercloud
Version: 1.0.0
Version: 1.0.4
Release: 1%{?dist}
Summary: Installation tools to install an undercloud via instack
@ -19,6 +19,8 @@ Requires: openstack-tuskar-ui
Requires: redhat-lsb-core
Requires: policycoreutils-python
Requires: selinux-policy >= 3.12.1-179
%description
instack-undercloud is a collection of installation tools to install an
@ -72,6 +74,19 @@ cp -ar json-files %{buildroot}/%{_datadir}/instack-undercloud
%changelog
* Wed Aug 06 2014 James Slagle <jslagle@redhat.com> 1.0.4-1
- Bump instack vm memory to 3GB (jslagle@redhat.com)
* Wed Aug 06 2014 James Slagle <jslagle@redhat.com> 1.0.3-1
- Fix spacing in Requires (jslagle@redhat.com)
* Wed Aug 06 2014 James Slagle <jslagle@redhat.com> 1.0.2-1
- Require at least the needed version of selinux-policy (jslagle@redhat.com)
* Tue Aug 05 2014 James Slagle <jslagle@redhat.com> 1.0.1-1
- Remove selinux-package-updates and swift-package-updates elements, as these
packages have been pushed live. (jslagle@redhat.com)
* Mon Jul 07 2014 James Slagle <jslagle@redhat.com> 1.0.0-1
- Upload the deployrc file to deploy-overcloudrc since that is the file that CI
always uses. (jslagle@redhat.com)

2
rel-eng/packages/instack-undercloud
View File

@ -1 +1 @@
1.0.0-1 ./
1.0.4-1 ./

12
scripts/instack-build-images
View File

@ -20,10 +20,8 @@ undercloud-package-install"}
export OVERCLOUD_CONTROL_DIB_EXTRA_ARGS=${OVERCLOUD_CONTROL_DIB_EXTRA_ARGS:-"\
pip-cache boot-stack cinder-api cinder-volume os-collect-config \
neutron-network-node dhcp-all-interfaces stackuser swift-proxy swift-storage \
cinder-lio \
swift-package-updates \
selinux-package-updates \
baremetal \
cinder-lio \
fedora-rdo-icehouse-repository \
horizon \
rabbitmq-server \
@ -39,7 +37,6 @@ nova-compute \
nova-kvm \
neutron-openvswitch-agent \
os-collect-config \
selinux-package-updates \
baremetal \
dhcp-all-interfaces \
stackuser \
@ -51,11 +48,10 @@ undercloud-package-install"}
export OVERCLOUD_CINDER_DIB_EXTRA_ARGS=${OVERCLOUD_CINDER_DIB_EXTRA_ARGS:-"\
pip-cache \
cinder-volume \
cinder-lio \
neutron-openvswitch-agent \
os-collect-config \
selinux-package-updates \
baremetal \
cinder-lio \
dhcp-all-interfaces \
stackuser \
fedora-rdo-icehouse-repository \
@ -69,8 +65,6 @@ pip-cache \
swift-storage \
neutron-openvswitch-agent \
os-collect-config \
swift-package-updates \
selinux-package-updates \
baremetal \
dhcp-all-interfaces \
stackuser \
@ -122,7 +116,7 @@ if [ ! -f overcloud-swift-storage.qcow2 ]; then
-a $NODE_ARCH \
-o overcloud-swift-storage \
$NODE_DIST \
$OVERCLOUD_SWIFT_DIB_EXTRA_ARGS
$OVERCLOUD_SWIFT_DIB_EXTRA_ARGS \
2>&1 | tee dib-overcloud-swift-storage.log
fi

1
scripts/instack-virt-setup
View File

@ -18,6 +18,7 @@ fi
source $DEVTEST_VARIABLES
export NODE_ARCH=${NODE_ARCH:-amd64}
export NODE_MEM=${NODE_MEM:-3072}
tripleo devtest_testenv.sh instackenv.json