diff --git a/elements/selinux-package-updates/install.d/00-update-selinux-policy-packages b/elements/selinux-package-updates/install.d/00-update-selinux-policy-packages deleted file mode 100755 index f7fdbab60..000000000 --- a/elements/selinux-package-updates/install.d/00-update-selinux-policy-packages +++ /dev/null @@ -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 diff --git a/elements/swift-package-updates/install.d/00-update-swift-packages b/elements/swift-package-updates/install.d/00-update-swift-packages deleted file mode 100755 index e5e031490..000000000 --- a/elements/swift-package-updates/install.d/00-update-swift-packages +++ /dev/null @@ -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 diff --git a/instack-undercloud.spec b/instack-undercloud.spec index 359274047..9c8cec367 100644 --- a/instack-undercloud.spec +++ b/instack-undercloud.spec @@ -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 1.0.4-1 +- Bump instack vm memory to 3GB (jslagle@redhat.com) + +* Wed Aug 06 2014 James Slagle 1.0.3-1 +- Fix spacing in Requires (jslagle@redhat.com) + +* Wed Aug 06 2014 James Slagle 1.0.2-1 +- Require at least the needed version of selinux-policy (jslagle@redhat.com) + +* Tue Aug 05 2014 James Slagle 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 1.0.0-1 - Upload the deployrc file to deploy-overcloudrc since that is the file that CI always uses. (jslagle@redhat.com) diff --git a/rel-eng/packages/instack-undercloud b/rel-eng/packages/instack-undercloud index eff0994b8..00600e957 100644 --- a/rel-eng/packages/instack-undercloud +++ b/rel-eng/packages/instack-undercloud @@ -1 +1 @@ -1.0.0-1 ./ +1.0.4-1 ./ diff --git a/scripts/instack-build-images b/scripts/instack-build-images index 1700056b0..103a4478a 100755 --- a/scripts/instack-build-images +++ b/scripts/instack-build-images @@ -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 diff --git a/scripts/instack-virt-setup b/scripts/instack-virt-setup index 55f6d30e8..4f96a0109 100755 --- a/scripts/instack-virt-setup +++ b/scripts/instack-virt-setup @@ -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