Skip to content

Commit

Permalink
Drop everything related to cockpit-machines-ovirt package
Browse files Browse the repository at this point in the history
  • Loading branch information
KKoukiou committed Jun 21, 2019
1 parent b4fa4f4 commit dd9341e
Show file tree
Hide file tree
Showing 54 changed files with 4 additions and 4,587 deletions.
1 change: 0 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ WEBPACK_PACKAGES = \
kubernetes \
machines \
networkmanager \
ovirt \
pcp \
packagekit \
playground \
Expand Down
2 changes: 1 addition & 1 deletion bots/image-create
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ parser.add_argument('image', help='The image to create')
args = parser.parse_args()

# default to --no-build for some images
if args.image in ["candlepin", "continuous-atomic", "fedora-atomic", "ipa", "rhel-atomic", "selenium", "openshift", "ovirt"]:
if args.image in ["candlepin", "continuous-atomic", "fedora-atomic", "ipa", "rhel-atomic", "selenium", "openshift"]:
if not args.no_build:
if args.verbose:
print("Creating machine without build capabilities based on the image type")
Expand Down
1 change: 0 additions & 1 deletion bots/image-trigger
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ REFRESH = {
"ubuntu-1804": { },
"ubuntu-stable": { },
"openshift": { "refresh-days": 30 },
"ovirt": { "refresh-days": 120 },
'rhel-7-6': { },
'rhel-7-7': { },
'rhel-8-0': { },
Expand Down
133 changes: 0 additions & 133 deletions bots/images/scripts/ovirt.setup

This file was deleted.

1 change: 0 additions & 1 deletion doc/guide/Makefile-guide.am
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ GUIDE_INCLUDES = \
doc/guide/feature-tuned.xml \
doc/guide/feature-users.xml \
doc/guide/feature-virtualmachines.xml \
doc/guide/feature-ovirt.xml \
doc/guide/packages.xml \
doc/guide/privileges.xml \
doc/guide/https.xml \
Expand Down
1 change: 0 additions & 1 deletion doc/guide/cockpit-guide.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
<xi:include href="feature-sosreport.xml"/>
<xi:include href="feature-packagekit.xml"/>
<xi:include href="feature-virtualmachines.xml"/>
<xi:include href="feature-ovirt.xml"/>
</part>

<part id="development">
Expand Down
55 changes: 0 additions & 55 deletions doc/guide/feature-ovirt.xml

This file was deleted.

12 changes: 1 addition & 11 deletions doc/guide/feature-virtualmachines.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,7 @@
<section id="feature-virtualmachines-extending">
<title>Extensions</title>
<para>
Base package <emphasis>cockpit-machines</emphasis> for management of virtual machines is based on Libvirt and
can be farther extended for features of higher level management applications (like oVirt) via concept
of providers (i.e. <link linkend="feature-ovirtvirtualmachines">oVirt Virtual Machines</link>).
</para>
<para>
Both <emphasis>cockpit-machines-ovirt</emphasis> and <emphasis>cockpit-machines</emphasis> RPM packages can be
installed together but only one of them can be loaded at a time depending on the <emphasis>priority</emphasis>
attribute set in <emphasis>manifest.json</emphasis> files.
</para>
<para>
By default, <emphasis>cockpit-machines-ovirt</emphasis> takes precedence over <emphasis>cockpit-machines</emphasis>.
Base package <emphasis>cockpit-machines</emphasis> for management of virtual machines is based on Libvirt.
</para>
<para>
New features for <emphasis>cockpit-machines</emphasis> should be only implemented for the componenent
Expand Down
10 changes: 0 additions & 10 deletions pkg/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@ playground_DATA = \
dist/playground/extra.de.po: pkg/playground/extra.de.po
$(COPY_RULE)

ovirtdir = $(pkgdatadir)/ovirt
ovirt_DATA = \
dist/ovirt/install.sh \
$(NULL)

dist/ovirt/install.sh: pkg/ovirt/install.sh
$(COPY_RULE)

metainfodir = ${datarootdir}/metainfo
metainfo_DATA = pkg/sosreport/org.cockpit-project.cockpit-sosreport.metainfo.xml \
pkg/kdump/org.cockpit-project.cockpit-kdump.metainfo.xml \
Expand All @@ -37,10 +29,8 @@ EXTRA_DIST += \
pkg/playground/extra.de.po \
pkg/users/mock \
pkg/lib/qunit-template.html \
pkg/ovirt/install.sh \
$(playground_DATA) \
$(pkg_TESTS) \
$(ovirt_DATA) \
$(metainfo_DATA) \
$(pixmaps_DATA) \
$(NULL)
Expand Down
1 change: 0 additions & 1 deletion pkg/machines/components/vnc.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ class Vnc extends React.Component {
return;
}

// consoleDetail can be retrieved asynchronously (like in pkg/ovirt flow)
const { consoleDetail } = props;
if (!consoleDetail) {
logDebug('Vnc component: console detail not yet provided');
Expand Down
Loading

0 comments on commit dd9341e

Please sign in to comment.