From ac3a86983e4c049a3115c7bd77eeacaeb19d0ca3 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Thu, 30 Mar 2017 23:03:43 -0400 Subject: Updating Apex to OpenStack Ocata - power management updated to virtualbmc, pxe_ssh is deprecated - removing custom tacker build - removing custom congress build - disabling yum update in undercloud on the cli instead of in a patch - Undercloud is direct kernel booted now, there are no kernel and initrd in the disk image from upstream - remove OpenDaylight previous to Carbon JIRA: APEX-433 JIRA: APEX-432 JIRA: APEX-431 Change-Id: I6963f16e65eacade5607a3082b58b6150331406c Signed-off-by: Dan Radez --- build/rpm_specs/openstack-congress-server.service | 13 ---- build/rpm_specs/openstack-congress.spec | 77 --------------------- build/rpm_specs/openstack-tacker-server.service | 15 ---- build/rpm_specs/openstack-tacker.spec | 84 ----------------------- build/rpm_specs/opnfv-apex-common.spec | 8 ++- build/rpm_specs/opnfv-apex-release.spec | 2 +- build/rpm_specs/opnfv-apex-undercloud.spec | 2 +- build/rpm_specs/python-tackerclient.spec | 44 ------------ 8 files changed, 8 insertions(+), 237 deletions(-) delete mode 100644 build/rpm_specs/openstack-congress-server.service delete mode 100644 build/rpm_specs/openstack-congress.spec delete mode 100644 build/rpm_specs/openstack-tacker-server.service delete mode 100644 build/rpm_specs/openstack-tacker.spec delete mode 100644 build/rpm_specs/python-tackerclient.spec (limited to 'build/rpm_specs') diff --git a/build/rpm_specs/openstack-congress-server.service b/build/rpm_specs/openstack-congress-server.service deleted file mode 100644 index 20c3a67b..00000000 --- a/build/rpm_specs/openstack-congress-server.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=OpenStack Congress Server -After=syslog.target network.target - -[Service] -Type=simple -User=congress -ExecStart=/usr/bin/congress-server --config-file /etc/congress/congress.conf --log-file /var/log/congress/congress.log -Restart=on-failure - -[Install] -WantedBy=multi-user.target - diff --git a/build/rpm_specs/openstack-congress.spec b/build/rpm_specs/openstack-congress.spec deleted file mode 100644 index 21211932..00000000 --- a/build/rpm_specs/openstack-congress.spec +++ /dev/null @@ -1,77 +0,0 @@ -%define debug_package %{nil} - -Name: openstack-congress -Version: 2016.2 -Release: 1%{?git}%{?dist} -Summary: OpenStack servicevm/device manager - -Group: Applications/Internet -License: Apache 2.0 -URL: https://wiki.openstack.org/wiki/Congress/Installation -Source0: openstack-congress.tar.gz - -BuildArch: noarch - -BuildRequires: python-setuptools python2-oslo-config python2-debtcollector libffi-devel python-devel openssl-devel python2-oslo-config python2-debtcollector python34-devel - -%description -OpenStack policy manager - -%prep -%setup -q -rm requirements.txt - - -%build -#rm requirements.txt -#/usr/bin/python setup.py build - - -%install -/usr/bin/python setup.py install --root=%{buildroot} - -rm -rf %{buildroot}/usr/lib/python2.7/site-packages/congress_tempest_tests - -install -d -m 755 %{buildroot}/var/log/congress/ -install -d -m 755 %{buildroot}/etc/congress/snapshot/ - -install etc/api-paste.ini %{buildroot}/etc/congress/api-paste.ini -install etc/policy.json %{buildroot}/etc/congress/policy.json -tox -e genconfig --workdir ../.tox -install etc/congress.conf.sample %{buildroot}/etc/congress/congress.conf - -install -p -D -m 644 openstack-congress-server.service %{buildroot}%{_unitdir}/openstack-congress-server.service -install -d -m 755 %{buildroot}%{_sharedstatedir}/congress - -%pre -getent group congress >/dev/null || groupadd -r congress -if ! getent passwd congress >/dev/null; then - useradd -r -g congress -G congress,nobody -d %{_sharedstatedir}/congress -s /sbin/nologin -c "OpenStack Congress Daemon" congress -fi -exit 0 - -%post -%systemd_post openstack-congress - -%preun -%systemd_preun openstack-congress - -%postun -%systemd_postun_with_restart openstack-congress - -%files -%{python2_sitelib}/congress-*.egg-info -/etc/congress/api-paste.ini -/etc/congress/congress.conf -/etc/congress/policy.json -/usr/bin/congress-db-manage -/usr/bin/congress-server -%{_unitdir}/openstack-congress-server.service -/usr/lib/python2.7/site-packages/congress -/usr/lib/python2.7/site-packages/congress_dashboard -/usr/lib/python2.7/site-packages/antlr3runtime - -%dir %attr(0750, congress, root) %{_localstatedir}/log/congress - -%changelog - diff --git a/build/rpm_specs/openstack-tacker-server.service b/build/rpm_specs/openstack-tacker-server.service deleted file mode 100644 index 9bf16cd5..00000000 --- a/build/rpm_specs/openstack-tacker-server.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=OpenStack Tacker Server -After=syslog.target network.target - -[Service] -Type=simple -User=tacker -ExecStart=/usr/bin/openstack-tacker-server --config-file /usr/share/tacker/tacker-dist.conf --config-file /etc/tacker/tacker.conf --log-file /var/log/tacker/tacker.log -PrivateTmp=true -NotifyAccess=all -KillMode=process -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/build/rpm_specs/openstack-tacker.spec b/build/rpm_specs/openstack-tacker.spec deleted file mode 100644 index 0ec4d518..00000000 --- a/build/rpm_specs/openstack-tacker.spec +++ /dev/null @@ -1,84 +0,0 @@ -%define debug_package %{nil} - -Name: openstack-tacker -Version: 2016.2 -Release: 1%{?git} -Summary: OpenStack servicevm/device manager - -Group: Applications/Internet -License: Apache 2.0 -URL: https://wiki.openstack.org/wiki/Tacker/Installation -Source0: openstack-tacker.tar.gz - -BuildArch: noarch -BuildRequires: python-setuptools - -%description -OpenStack servicevm/device manager - -%prep -%setup -q - - -%build -rm requirements.txt -#/usr/bin/python setup.py build - - -%install -/usr/bin/python setup.py install --root=%{buildroot} -#remove tests -rm -rf %{buildroot}/usr/lib/python2.7/site-packages/tacker/tests -# Move config files from /usr/etc/ to /etc -mv %{buildroot}/usr/etc %{buildroot} -#remove init script -rm -fr %{buildroot}/etc/init.d - -# Install systemd script -install -p -D -m 644 openstack-tacker-server.service %{buildroot}%{_unitdir}/openstack-tacker-server.service - -# Remove egg-info -rm -rf %{buildroot}/usr/lib/python2.7/site-packages/*egg-info - -install -d -m 755 %{buildroot}%{_localstatedir}/cache/tacker -install -d -m 755 %{buildroot}%{_sharedstatedir}/tacker -install -d -m 755 %{buildroot}%{_localstatedir}/log/tacker - -%pre -getent group tacker >/dev/null || groupadd -r tacker -if ! getent passwd tacker >/dev/null; then - useradd -r -g tacker -G tacker,nobody -d %{_sharedstatedir}/tacker -s /sbin/nologin -c "OpenStack Tacker Daemon" tacker -fi -exit 0 - -%post -%systemd_post openstack-tacker-server - -%preun -%systemd_preun openstack-tacker-server - -%postun -%systemd_postun_with_restart openstack-tacker-server - -%files -/usr/bin/tacker-server -/usr/bin/tacker-db-manage -/usr/bin/tacker-rootwrap -%{_unitdir}/openstack-tacker-server.service -/usr/lib/python2.7/site-packages/tacker/* - -#%config(noreplace) %attr(-, root, tacker) %{_sysconfdir}/tacker/tacker.conf` -%{_sysconfdir}/rootwrap.d/tacker.filters -%{_sysconfdir}/tacker/api-paste.ini -%{_sysconfdir}/tacker/policy.json -%{_sysconfdir}/tacker/rootwrap.conf -%dir %attr(0750, tacker, root) %{_localstatedir}/cache/tacker -%dir %attr(0750, tacker, root) %{_sharedstatedir}/tacker -%dir %attr(0750, tacker, root) %{_localstatedir}/log/tacker - -%changelog -* Wed Nov 30 2016 Dan Radez - 2016.2-1 -- Version update for Newton - -* Mon Jul 25 2016 Tim Rozet - 2015.2-1 -- Initial Commit diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec index 13a04817..541c1fec 100644 --- a/build/rpm_specs/opnfv-apex-common.spec +++ b/build/rpm_specs/opnfv-apex-common.spec @@ -10,8 +10,8 @@ Source0: opnfv-apex-common.tar.gz BuildArch: noarch BuildRequires: python-docutils python34-devel -Requires: openstack-tripleo opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools -Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python3-jinja2 python3-ipmi +Requires: opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools +Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python3-jinja2 python3-ipmi python2-virtualbmc Requires: ipxe-roms-qemu >= 20160127-1 %description @@ -77,6 +77,7 @@ install lib/undercloud-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ install lib/overcloud-deploy-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ install lib/post-install-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ install lib/utility-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ +install lib/configure-vm %{buildroot}%{_var}/opt/opnfv/lib/ install lib/python/apex_python_utils.py %{buildroot}%{_var}/opt/opnfv/lib/python/ mkdir -p %{buildroot}%{python3_sitelib}/apex/ install lib/python/apex/__init__.py %{buildroot}%{python3_sitelib}/apex/ @@ -117,6 +118,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_var}/opt/opnfv/lib/overcloud-deploy-functions.sh %{_var}/opt/opnfv/lib/post-install-functions.sh %{_var}/opt/opnfv/lib/utility-functions.sh +%{_var}/opt/opnfv/lib/configure-vm %{_var}/opt/opnfv/lib/python/ %{python3_sitelib}/apex/ %{_var}/opt/opnfv/lib/installer/domain.xml @@ -161,6 +163,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Mon May 08 2017 Dan Radez - 5.0-2 +- adding configure-vm * Tue Apr 04 2017 Dan Radez - 5.0-1 - Version update for Euphrates - rename to ovs_dpdk diff --git a/build/rpm_specs/opnfv-apex-release.spec b/build/rpm_specs/opnfv-apex-release.spec index 1be58a1c..5f84a4fc 100644 --- a/build/rpm_specs/opnfv-apex-release.spec +++ b/build/rpm_specs/opnfv-apex-release.spec @@ -9,7 +9,7 @@ URL: https://gerrit.opnfv.org/gerrit/apex.git Source0: opnfv-apex-release.tar.gz BuildArch: noarch -Requires: rdo-release = newton epel-release libvirt-python +Requires: rdo-release = ocata epel-release libvirt-python %description RPM Release file that provides a yum repo file to install OPNFV Apex diff --git a/build/rpm_specs/opnfv-apex-undercloud.spec b/build/rpm_specs/opnfv-apex-undercloud.spec index 55a614d0..93fc6e0d 100644 --- a/build/rpm_specs/opnfv-apex-undercloud.spec +++ b/build/rpm_specs/opnfv-apex-undercloud.spec @@ -9,7 +9,7 @@ URL: https://gerrit.opnfv.org/gerrit/apex.git Source0: opnfv-apex-undercloud.tar.gz BuildArch: noarch -BuildRequires: openvswitch libvirt qemu-kvm python-docutils +BuildRequires: python-docutils Requires: openvswitch libvirt qemu-kvm bridge-utils libguestfs-tools %description diff --git a/build/rpm_specs/python-tackerclient.spec b/build/rpm_specs/python-tackerclient.spec deleted file mode 100644 index 5758f7c0..00000000 --- a/build/rpm_specs/python-tackerclient.spec +++ /dev/null @@ -1,44 +0,0 @@ -%define debug_package %{nil} - -Name: python-tackerclient -Version: 2016.2 -Release: 1%{?git} -Summary: CLI and Client Library for OpenStack Networking - -Group: Applications/Internet -License: Apache 2.0 -URL: https://wiki.openstack.org/wiki/Tacker/Installation -Source0: python-tackerclient.tar.gz - -BuildArch: noarch -BuildRequires: python-setuptools -#Requires: stevedore>=1.5.0 http oslo.config>=1.11.0 oslo.messaging!=1.17.0!=1.17.1>=1.16.0 oslo.rootwrap>=2.0.0 python-novaclient>=2.22.0 - -%description -CLI and Client Library for OpenStack Networking - -%prep -%setup -q - - -%build -rm requirements.txt -#/usr/bin/python setup.py build - - -%install -/usr/bin/python setup.py install --prefix=%{buildroot} --install-lib=%{buildroot}/usr/lib/python2.7/site-packages -#rm -rf %{buildroot}/usr/lib/python2.7/site-packages/tacker/tests - - -%files -/bin/tacker -/usr/lib/python2.7/site-packages/tackerclient/* -/usr/lib/python2.7/site-packages/python_tackerclient-* - -%changelog -* Wed Nov 30 2016 Dan Radez - 2016.2-1 -- Version update for Newton - -* Mon Jul 25 2016 Tim Rozet - 2015.2-1 -- Initial Commit -- cgit 1.2.3-korg