diff options
| author |   Michael Chapman <michapma@redhat.com> | 2016-03-24 01:09:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-03-24 01:09:03 +0000 |
| commit | 81e8d7b55fbc27d8f25031817baf92d9b100f322 (patch) | |
| tree | 819a8a94a6ef9db8d7cc2d8480d768d9daca274f /build/opnfv-apex-common.spec | |
| parent | a896444c04552b866a9460bbe70ae3488e4877d9 (diff) | |
| parent | 4b5e79294eecf7e10bfb1459c55f9186312c32bf (diff) | |
Merge topics 'compute_count_fix', 'build_rewrite'
* changes:
Allow 2+ compute node for none HA installs APEX-117
updating vm creation for virt deployment
Diffstat (limited to 'build/opnfv-apex-common.spec')
| -rw-r--r-- | build/opnfv-apex-common.spec | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index e0fd475a..a635a52d 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -9,8 +9,8 @@ URL: https://gerrit.opnfv.org/gerrit/apex.git Source0: opnfv-apex-common.tar.gz BuildArch: noarch -BuildRequires: openvswitch qemu-kvm python-docutils -Requires: opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools +BuildRequires: python-docutils +Requires: openstack-tripleo opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools %description Scripts for OPNFV deployment using RDO Manager @@ -35,7 +35,7 @@ install config/deploy/os-odl_l2-sfc-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-a install config/deploy/os-odl_l3-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml install config/deploy/os-onos-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml install config/deploy/os-opencontrail-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-opencontrail-nofeature-ha.yaml -install config/deploy/network/network_settings.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/network_settings.yaml +install config/network/network_settings.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/network_settings.yaml mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/ install lib/common-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ @@ -48,7 +48,7 @@ install docs/installation-instructions.html %{buildroot}%{_docdir}/opnfv/ install docs/release-notes/index.rst %{buildroot}%{_docdir}/opnfv/release-notes.rst install docs/release-notes.html %{buildroot}%{_docdir}/opnfv/ install config/deploy/deploy_settings.yaml %{buildroot}%{_docdir}/opnfv/deploy_settings.yaml.example -install config/deploy/network/network_settings.yaml %{buildroot}%{_docdir}/opnfv/network_settings.yaml.example +install config/network/network_settings.yaml %{buildroot}%{_docdir}/opnfv/network_settings.yaml.example install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/inventory.yaml.example %files |