From d84beb35dfa3a804eef35e1349ffec74ef9bbd87 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Wed, 6 Apr 2016 14:48:18 -0400 Subject: Updates to the iso build - refreshing to the Cent 7 1511 version of comps.xml - adding a graphical desktop install option - refreshing to the Cent 7 1511 version of isolinux.cfg - adding package depedencies for Mitaka ISO install JIRA: APEX-104 Change-Id: I73413270d2da656a4421f78a93504b611d300206 Signed-off-by: Dan Radez --- build/Makefile | 2 +- build/c7-opnfv-x86_64-comps.xml | 140 ++++++++++++++++++++++++++++++++++++---- build/isolinux.cfg | 3 +- 3 files changed, 130 insertions(+), 15 deletions(-) (limited to 'build') diff --git a/build/Makefile b/build/Makefile index 3746fab5..8a498a66 100644 --- a/build/Makefile +++ b/build/Makefile @@ -239,7 +239,7 @@ iso: iso-clean images rpms $(CENTISO) @ln $(RPMODL) centos/Packages @ln $(RPMONO) centos/Packages @ln $(RPMSFC) centos/Packages - cd centos/Packages && yumdownloader openvswitch && yumdownloader openstack-tripleo + cd centos/Packages && yumdownloader openvswitch && yumdownloader openstack-tripleo && yumdownloader jq # regenerate yum repo data @echo "Generating new yum metadata" createrepo --update -g ../c7-opnfv-x86_64-comps.xml centos diff --git a/build/c7-opnfv-x86_64-comps.xml b/build/c7-opnfv-x86_64-comps.xml index 278e3116..a9b0af0c 100644 --- a/build/c7-opnfv-x86_64-comps.xml +++ b/build/c7-opnfv-x86_64-comps.xml @@ -2,13 +2,39 @@ - apex - Apex OPNFV Images and Configuration Files - Disk images and configuration files used to launch an Apex OPNFV deployment. + apex-opendaylight + OPNFV Apex OpenDaylight (non-sfc) Support + Disk images and configuration files used to launch an Apex OpenDaylight deployment. false false opnfv-apex + opnfv-common + opnfv-undercloud + + + + apex-onos + OPNFV Apex ONOS (non-sfc) Support + Disk images and configuration files used to launch an Apex ONOS deployment. + false + false + + opnfv-apex-onos + opnfv-common + opnfv-undercloud + + + + apex-opendaylight-sfc + OPNFV Apex OpenDaylight SFC Support + Disk images and configuration files used to launch an Apex ODL SFC deployment. + false + false + + opnfv-apex-opendaylight-sfc + opnfv-common + opnfv-undercloud @@ -304,6 +330,7 @@ amanda-client bacula-client + rear @@ -1173,6 +1200,7 @@ iwl6000g2b-firmware iwl6050-firmware iwl7260-firmware + iwl7265-firmware kernel-tools libertas-sd8686-firmware libertas-sd8787-firmware @@ -1708,6 +1736,8 @@ pam_krb5 samba-winbind samba-winbind-clients + sssd-dbus + sssd-tools @@ -2638,11 +2668,13 @@ gnome-icon-theme-symbolic gnome-initial-setup gnome-packagekit + gnome-packagekit-updater gnome-screenshot gnome-session gnome-session-xsession gnome-settings-daemon gnome-shell + gnome-software gnome-system-log gnome-system-monitor gnome-terminal @@ -2672,7 +2704,7 @@ nautilus nautilus-open-terminal nautilus-sendto - NetworkManager-libreswan + NetworkManager-libreswan-gnome nm-connection-editor orca PackageKit-command-not-found @@ -2696,6 +2728,7 @@ fonts-tweak-tool gconf-editor gedit-plugins + gnome-shell-browser-plugin gnote seahorse-nautilus seahorse-sharing @@ -3160,6 +3193,9 @@ ipa-admintools ipa-server pki-ca + bind-pkcs11 + bind-pkcs11-utils + ipa-server-dns ipa-server-trust-ad nuxwdog slapi-nis @@ -3248,6 +3284,7 @@ compat-dapl compat-opensm-libs infiniband-diags + libhfi1 libibcommon libocrdma libusnic_verbs @@ -3255,6 +3292,7 @@ opensm perftest qperf + rdma-ndd srptools @@ -5391,6 +5429,7 @@ hpijs paps pnm2ppa + python-smbc system-config-printer system-config-printer-udev hplip @@ -5747,7 +5786,55 @@ ruby-runtime Ruby Support + Ruby সমৰ্থন + Ruby সমর্থন + Podpora pro Ruby + Ruby-Unterstützung + Soporte de Ruby + Prise en charge Ruby + Ruby આધાર + रूबी समर्थन + Supporto Ruby + Ruby サポート + ರೂಬಿ ಬೆಂಬಲ + Ruby 지원 + റൂബി പിന്തുണ + रूबि समर्थन + Ruby ସହାୟତା + ਰੂਬੀ ਸਮਰਥਨ + Obsługa języka Ruby + Suporte Ruby + Поддержка Ruby + ரூபி ஆதரவு + Ruby తోడ్పాటు + Підтримка Ruby + Ruby 支持 + 支援 Ruby Ruby interfaces to common libraries and functionality. + সাধাৰণ লাইব্ৰেৰীসমূহ আৰু কাৰ্য্যকৰীতালে Ruby আন্তঃপৃষ্ঠসমূহ। + সাধারণ লাইব্রেরি ও কাজের জন্য ব্যবহারযোগ্য Ruby ইন্টারফেস। + Rozhraní jazyka Ruby pro běžné knihovny a funkcionalitu. + Ruby-Schnittstellen zu gemeinsamen Bibliotheken und Funktionalitäten. + Interfaces de Ruby para funcionalidad y bibliotecas comunes. + Interfaces Ruby des bibliothèques communes et fonctionnalité. + સામાન્ય લાઇબ્રેરીઓ અને કાર્યક્ષમતા માટે Ruby ઇન્ટરફેસ. + सामान्य लाइब्रेरी और कार्यशीलता का रूबी अंतरफलक + Interfacce di Ruby per le funzionalità e librerie comuni. + 一般的なライブラリと機能への Ruby インターフェイスです + ಸಾಮಾನ್ಯ ಲೈಬ್ರರಿಗಳು ಮತ್ತು ಕ್ರಿಯಾಶೀಲನೆಗಾಗಿ ರೂಬಿ ಸಂಪರ್ಕಸಾಧನಗಳು. + 일반적인 라이브러리 및 기능에 대한 Ruby 인터페이스 + സാധാരണ ലൈബ്രറികളിലേക്കും പ്രവര്‍ത്തനങ്ങളിലേക്കുമുള്ള റൂബി ഇന്റര്‍ഫെയിസുകള്‍. + कॉमन लाइब्ररिरज् व सुविधाकरिता रूबि संवाद. + ସାଧାରଣ ଲାଇବ୍ରେରୀ ଏବଂ କାର୍ଯ୍ୟ ପାଇଁ Ruby ଅନ୍ତରାପୃଷ୍ଠ। + ਕਾਮਨ ਲਾਇਬਰੇਰੀਆਂ ਅਤੇ ਫੰਕਸ਼ਨੈਲਿਟੀਆਂ ਲਈ ਰੂਬੀ ਇੰਟਰਫੇਸ। + Interfejsy Ruby dla często używanych bibliotek i funkcji. + Interfaces do Ruby para bibliotecas comuns e funcionalidade + Интерфейсы Ruby для общих библиотек + பொதுவான தரவகங்களுக்கும் செயலம்சங்களுக்கும் ரூபி இடைமுகங்கள். + ఉమ్మడి లైబ్రరీలు మరియు ప్రమేయత కొరకు Ruby యింటర్ఫేసులు. + Інтерфейси Ruby до загальних бібліотек та можливостей системи. + 常用库和功能的 Ruby 界面。 + Ruby 介面，連接至一般函示庫與功能。 false false @@ -6041,6 +6128,7 @@ mgetty pexpect rdist + rear rrdtool screen scrub @@ -7753,21 +7841,49 @@ - opnfv_apex - Apex OPNFV Provisioning Server Install - Installs an Apex OPNFV Provisioning Server - 40 + opnfv-apex + OPNFV Apex Provisioning Server + Installs an OPNFV Apex Provisioning Server + 10 base core virtualization-hypervisor virtualization-tools - apex + apex-opendaylight + apex-onos + apex-opendaylight-sfc - debugging - network-file-system-client - remote-system-management + virtualization-platform + + + + graphical-opnfv-apex + OPNFV Apex Provisioning Server w/Gnome Desktop + Installs an OPNFV Apex Provisioning Server, with the Gnome Desktop Environment + 20 + + base + core + fonts + gnome-desktop + guest-agents + guest-desktop-agents + input-methods + internet-browser + multimedia + print-client + x11 + virtualization-hypervisor + virtualization-tools + apex-opendaylight + apex-onos + apex-opendaylight-sfc + + + kde-desktop + virtualization-client virtualization-platform diff --git a/build/isolinux.cfg b/build/isolinux.cfg index 487226e1..87ae01b0 100644 --- a/build/isolinux.cfg +++ b/build/isolinux.cfg @@ -59,8 +59,7 @@ menu separator # insert an empty line menu separator # insert an empty line label linux - menu label ^Install Apex OPNFV :: CentOS 7 - menu default + menu label ^Install OPNFV Apex :: CentOS 7 kernel vmlinuz append initrd=initrd.img inst.stage2=hd:LABEL=OPNFV\x20CentOS\x207\x20x86_64 -- cgit 1.2.3-korg