diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-01-04 15:54:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-04 15:54:15 +0000 |
| commit | d440624d1965100d8c68c3da1466b40b3e4d8f6d (patch) | |
| tree | 2d7a9d3d5c4a76b9ece0618aa59f56d048609ef6 | |
| parent | 66085844d8d343978cfedb6fee7b144cd099805f (diff) | |
| parent | cd890bcf3bacc4c28a2e4b3716eca6677d7355bb (diff) | |
Merge "cleaning out some tarball manipulations from Makefile that are unnessesary"
| -rw-r--r-- | build/Makefile | 4 | ||||
| -rw-r--r-- | build/opnfv-apex.spec | 5 | ||||
| -rwxr-xr-x | ci/deploy.sh | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/build/Makefile b/build/Makefile index 7fd32281..87e8db08 100644 --- a/build/Makefile +++ b/build/Makefile @@ -110,11 +110,7 @@ rpm: tar -u --xform="s:brbm1-net.xml:opnfv-apex-$(RPMVERS)/build/brbm1-net.xml:" --file=opnfv-apex.tar brbm1-net.xml tar -u --xform="s:default-pool.xml:opnfv-apex-$(RPMVERS)/build/default-pool.xml:" --file=opnfv-apex.tar default-pool.xml tar -u --xform="s:instackenv-virt.json:opnfv-apex-$(RPMVERS)/build/instackenv-virt.json:" --file=opnfv-apex.tar instackenv-virt.json - tar -u --xform="s:instackenv.json.example:opnfv-apex-$(RPMVERS)/build/instackenv.json.example:" --file=opnfv-apex.tar instackenv.json.example tar -u --xform="s:stack/overcloud-full-odl.qcow2:opnfv-apex-$(RPMVERS)/build/stack/overcloud-full.qcow2:" --file=opnfv-apex.tar stack/overcloud-full-odl.qcow2 - tar -u --xform="s:network-environment.yaml:opnfv-apex-$(RPMVERS)/build/network-environment.yaml:" --file=opnfv-apex.tar network-environment.yaml - tar -u --xform="s:opendaylight-puppet-neutron.patch:opnfv-apex-$(RPMVERS)/build/opendaylight-puppet-neutron.patch:" --file=opnfv-apex.tar opendaylight-puppet-neutron.patch - tar -u --xform="s:opendaylight-tripleo-heat-templates.patch:opnfv-apex-$(RPMVERS)/build/opendaylight-tripleo-heat-templates.patch:" --file=opnfv-apex.tar opendaylight-tripleo-heat-templates.patch gzip -f opnfv-apex.tar rpmbuild -ba opnfv-apex.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(REVSTATE) | tr -d '_-')" diff --git a/build/opnfv-apex.spec b/build/opnfv-apex.spec index ee819481..9b6a6f85 100644 --- a/build/opnfv-apex.spec +++ b/build/opnfv-apex.spec @@ -43,8 +43,6 @@ install build/default-pool.xml %{buildroot}%{_var}/opt/opnfv/ install build/network-environment.yaml %{buildroot}%{_var}/opt/opnfv/ install build/nics/controller.yaml %{buildroot}%{_var}/opt/opnfv/nics/ install build/nics/compute.yaml %{buildroot}%{_var}/opt/opnfv/nics/ -install build/opendaylight-puppet-neutron.patch %{buildroot}%{_var}/opt/opnfv/ -install build/opendaylight-tripleo-heat-templates.patch %{buildroot}%{_var}/opt/opnfv/ install build/instackenv-virt.json %{buildroot}%{_var}/opt/opnfv/ install build/instackenv.json.example %{buildroot}%{_var}/opt/opnfv/ @@ -70,8 +68,6 @@ install config/deploy/deploy_settings.yaml %{buildroot}%{_docdir}/opnfv/deploy_s %{_var}/opt/opnfv/network-environment.yaml %{_var}/opt/opnfv/nics/controller.yaml %{_var}/opt/opnfv/nics/compute.yaml -%{_var}/opt/opnfv/opendaylight-puppet-neutron.patch -%{_var}/opt/opnfv/opendaylight-tripleo-heat-templates.patch %{_var}/opt/opnfv/instackenv-virt.json %{_var}/opt/opnfv/instackenv.json.example %{_var}/opt/opnfv/stack/overcloud-full.qcow2 @@ -86,6 +82,7 @@ install config/deploy/deploy_settings.yaml %{buildroot}%{_docdir}/opnfv/deploy_s %changelog * Tue Dec 15 2015 Dan Radez <dradez@redhat.com> - 2.6-1 - Added deploy settings for flat network config +- cleaned up files that don't need to be in the rpm * Wed Dec 09 2015 Dan Radez <dradez@redhat.com> - 2.5-1 - Updating the OpenDaylight Patch * Fri Dec 05 2015 Dan Radez <dradez@redhat.com> - 2.4-1 diff --git a/ci/deploy.sh b/ci/deploy.sh index 1d9a3bb9..47b82353 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -479,7 +479,7 @@ if [ -n "$DEPLOY_SETTINGS_FILE" ]; then openstack-config --set undercloud.conf DEFAULT inspection_iprange ${deploy_options_array['provisioning_inspection_iprange']} openstack-config --set undercloud.conf DEFAULT undercloud_debug false - if [ -n "$net_isolation_enabled" ]; then + if [ -n "$net_isolation_enabled" ]; then sed -i '/ControlPlaneSubnetCidr/c\\ ControlPlaneSubnetCidr: "${deploy_options_array['provisioning_cidr']##*/}"' network-environment.yaml sed -i '/ControlPlaneDefaultRoute/c\\ ControlPlaneDefaultRoute: ${deploy_options_array['provisioning_gateway']}' network-environment.yaml sed -i '/ExternalNetCidr/c\\ ExternalNetCidr: ${deploy_options_array['ext_net_cidr']}' network-environment.yaml |