diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-10-13 13:16:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-13 13:16:46 +0000 |
| commit | b21c6502ae68604ff12329b529225f74558b0162 (patch) | |
| tree | f2c5fd33a8ee1f818d897fb238b062d9dda250b8 | |
| parent | 8c30286eba760e1c2dc3c6a9812d7be5a02de47d (diff) | |
| parent | 7af4fecfe2d8e2d118498ab1d36665c2ca99e727 (diff) | |
Merge "Fix openstack-congress package name"
| -rwxr-xr-x | build/overcloud-full.sh | 4 | ||||
| -rw-r--r-- | build/variables.sh | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index b148542f..5ed2bdb4 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -125,8 +125,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "yum remove -y qemu-system-x86" \ --upload ../os-net-config.tar.gz:/usr/lib/python2.7/site-packages \ --run-command "cd /usr/lib/python2.7/site-packages/ && rm -rf os_net_config && tar xzf os-net-config.tar.gz" \ - --upload ../noarch/openstack-congress-2016.1-1.el7.centos.noarch.rpm:/root/ \ - --install /root/openstack-congress-2016.1-1.el7.centos.noarch.rpm \ + --upload ../noarch/$openstack_congress_pkg:/root/ \ + --install /root/$openstack_congress_pkg \ --install "python2-congressclient" \ --upload puppet-congress.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \ diff --git a/build/variables.sh b/build/variables.sh index ce9eb034..b26e7406 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -14,6 +14,7 @@ onos_release_file=onos-1.6.0-rc2.tar.gz onos_jdk_uri=http://artifacts.opnfv.org/apex/colorado onos_ovs_uri=http://artifacts.opnfv.org/apex/colorado onos_ovs_pkg=package_ovs_rpm3.tar.gz +openstack_congress_pkg="openstack-congress-2016.1-1$(rpm -E '%dist').noarch.rpm" doctor_driver=https://raw.githubusercontent.com/openstack/congress/master/congress/datasources/doctor_driver.py if [ -z ${GS_PATHNAME+x} ]; then GS_PATHNAME=/colorado |