diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-11-22 10:53:05 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-11-22 11:27:42 -0500 |
| commit | 052e43fa14e84228f6b66609c8aa5758df1493f0 (patch) | |
| tree | a95b5178b6da33737990be18c41bc318c723f20c /build/overcloud-full.sh | |
| parent | a75a950bd921bf4db78138fac6bca3cc17c13e44 (diff) | |
Fixes broken puppet-keystone calls to openstackclient
Issue where openstackclient is trying to parse keystone options, and
os-client-config is converting 'url' to 'endpoint' which openstackclient
does not support. Also updates mitaka delorean repo.
JIRA: APEX-349
Change-Id: I137a069c297d7d00fed64746b5de261d7b8f7d93
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build/overcloud-full.sh')
| -rwxr-xr-x | build/overcloud-full.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 798b5f43..8ffa2b40 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -92,6 +92,9 @@ pushd puppet-tacker > /dev/null git archive --format=tar.gz --prefix=tacker/ HEAD > ../puppet-tacker.tar.gz popd > /dev/null +# replace repo with latest delorean mitaka +wget https://trunk.rdoproject.org/centos7-mitaka/current-passed-ci/delorean.repo + # installing forked opnfv-puppet-tripleo # enable connection tracking for protocal sctp # upload dpdk rpms but do not install @@ -104,6 +107,7 @@ popd > /dev/null # git clone vsperf into the overcloud image # upload the tacker puppet module and untar it LIBGUESTFS_BACKEND=direct virt-customize \ + --upload delorean.repo:/etc/yum.repos.d/ \ --upload ../opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \ --run-command "yum update -y python-ipaddress rabbitmq-server erlang*" \ --run-command "if ! rpm -qa | grep python-redis; then yum install -y python-redis; fi" \ @@ -156,6 +160,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ../puppet-neutron/lib/puppet/type/neutron_agent_vpp.rb:/etc/puppet/modules/neutron/lib/puppet/type/ \ --mkdir /etc/puppet/modules/neutron/lib/puppet/provider/neutron_agent_vpp \ --upload ../puppet-neutron/lib/puppet/provider/neutron_agent_vpp/ini_setting.rb:/etc/puppet/modules/neutron/lib/puppet/provider/neutron_agent_vpp/ \ + --upload ../os-client-config/config.py:/usr/lib/python2.7/site-packages/os_client_config/ \ -a overcloud-full_build.qcow2 rm -rf ovs_nsh_patches |