mirror of
https://github.com/OpenNebula/one.git
synced 2025-04-01 06:50:25 +03:00
M #-: Get rid of obsolete .vib files
(cherry picked from commit 419bfe5a450d5b33310f96df473873141809c255)
This commit is contained in:
Tino Vazquez
parent
0bfe41a530
commit
d019bd49a6
@ -2333,13 +2333,6 @@ WEBSOCKIFY_SHARE_MODULE_FILES="share/websockify/websockify/__init__.py \
|
||||
share/websockify/websockify/websocket.py \
|
||||
share/websockify/websockify/websocketproxy.py"
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Installation packages for ESX hosts to enable VNC ports
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
ESX_FW_VNC_SHARE_FILES="share/esx-fw-vnc/fw-vnc.vib \
|
||||
share/esx-fw-vnc/fw-vnc.zip"
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# HOOK scripts, to be installed under $VAR_LOCATION/remotes/hooks/autostart
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
.PHONY: fw-vnc.vib clean
|
||||
|
||||
fw-vnc.vib: vmware-esx-vib-author-5.0.0-0.0.847598.i386.rpm
|
||||
vagrant plugin install vagrant-sshfs
|
||||
vagrant up
|
||||
vagrant destroy -f
|
||||
@echo "Package successfully $@ built"
|
||||
|
||||
vmware-esx-vib-author-5.0.0-0.0.847598.i386.rpm:
|
||||
wget -O $@ https://download3.vmware.com/software/vmw-tools/vibauthor/vmware-esx-vib-author-5.0.0-0.0.847598.i386.rpm
|
||||
|
||||
clean:
|
||||
-rm -rf fw-vnc.vib fw-vnc.zip vmware-esx-vib-author*.rpm
|
||||
-vagrant destroy -f
|
||||
@ -1,44 +0,0 @@
|
||||
# Building ESX VIB package
|
||||
|
||||
Requirements:
|
||||
|
||||
1. [Vagrant](https://www.vagrantup.com/)
|
||||
2. [VirtualBox](https://www.virtualbox.org/)
|
||||
|
||||
Other requirements (automatically get by `Makefile`):
|
||||
|
||||
3. Vagrant plugin vagrant-sshfs
|
||||
4. [VIB Author](https://labs.vmware.com/flings/vib-author) tool RPM in current directory
|
||||
|
||||
# Build
|
||||
|
||||
VIB package build is based on a deprecated, but still working, *VIB Author* tool.
|
||||
This tool works fine on old EL/CentOS 6, that's why the build process
|
||||
(unfortunately) requires the Vagrant+VirtualBox to provide the build
|
||||
environment with the CentOS 6.
|
||||
|
||||
There are two possible approaches to building the VIB package.
|
||||
|
||||
### 1. Makefile
|
||||
|
||||
Just start the `make` and required Vagrant plugin and latest known
|
||||
VIB Author tool will be automatically downloaded and new VIB
|
||||
packages built.
|
||||
|
||||
```
|
||||
$ make
|
||||
```
|
||||
|
||||
You can find the fresh packages in `fw-vnc.vib` and `fw-vnc.zip`.
|
||||
|
||||
### 2. Manual
|
||||
|
||||
1. download [VIB Author](https://labs.vmware.com/flings/vib-author) tool RPM into the current directory
|
||||
2. start Vagrant
|
||||
|
||||
```
|
||||
$ vagrant plugin install vagrant-sshfs
|
||||
$ vagrant up && vagrant destroy -f
|
||||
```
|
||||
|
||||
You can find the fresh packages in `fw-vnc.vib` and `fw-vnc.zip`.
|
||||
35
share/esx-fw-vnc/Vagrantfile
vendored
35
share/esx-fw-vnc/Vagrantfile
vendored
@ -1,35 +0,0 @@
|
||||
# -*- mode: ruby -*-
|
||||
# vi: set ft=ruby :
|
||||
#
|
||||
if Dir.glob('vmware-esx-vib-author*.rpm').size != 1
|
||||
STDERR.puts <<EOT
|
||||
Missing vmware-esx-vib-author RPM, please download and put in current dir.:
|
||||
https://labs.vmware.com/flings/vib-author
|
||||
|
||||
EOT
|
||||
end
|
||||
|
||||
# Vagrant configurations
|
||||
ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
|
||||
|
||||
Vagrant.configure("2") do |config|
|
||||
config.vm.box = "centos/6"
|
||||
|
||||
config.vm.provider :virtualbox do |v|
|
||||
v.name = "VIB Vagrant Build"
|
||||
end
|
||||
|
||||
config.vm.synced_folder ".", "/vagrant", type: "sshfs"
|
||||
|
||||
# install VIB author
|
||||
config.vm.provision "shell", inline: <<-SCRIPT
|
||||
yum -y install /vagrant/*.rpm
|
||||
SCRIPT
|
||||
|
||||
# (always) generate VIB/ZIP
|
||||
config.vm.provision "shell", run: "always", inline: <<-SCRIPT
|
||||
set -e
|
||||
cd /vagrant/
|
||||
vibauthor -C -t vib/ -v fw-vnc.vib -O fw-vnc.zip --force
|
||||
SCRIPT
|
||||
end
|
||||
Binary file not shown.
Binary file not shown.
@ -1,33 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<vib version="5.0">
|
||||
<type>bootbank</type>
|
||||
<name>fw-vnc</name>
|
||||
<version>1.1.0-1</version>
|
||||
<vendor>OpenNebulaSystems</vendor>
|
||||
<summary>Firewall rules to enable VNC traffic</summary>
|
||||
<description>Firewall rules to enable VNC traffic</description>
|
||||
<urls/>
|
||||
<relationships>
|
||||
<depends/>
|
||||
<conflicts/>
|
||||
<replaces/>
|
||||
<provides/>
|
||||
<compatibleWith/>
|
||||
</relationships>
|
||||
<software-tags/>
|
||||
<system-requires>
|
||||
<maintenance-mode>false</maintenance-mode>
|
||||
</system-requires>
|
||||
<file-list>
|
||||
<file>etc/vmware/firewall/vnc.xml</file>
|
||||
</file-list>
|
||||
<acceptance-level>community</acceptance-level>
|
||||
<live-install-allowed>true</live-install-allowed>
|
||||
<live-remove-allowed>true</live-remove-allowed>
|
||||
<cimom-restart>false</cimom-restart>
|
||||
<stateless-ready>true</stateless-ready>
|
||||
<overlay>false</overlay>
|
||||
<payloads>
|
||||
<payload name="fw-vnc" type="vgz"/>
|
||||
</payloads>
|
||||
</vib>
|
||||
@ -1,175 +0,0 @@
|
||||
<ConfigRoot>
|
||||
<service>
|
||||
<id>VNC</id>
|
||||
<enabled>true</enabled>
|
||||
<required>false</required>
|
||||
|
||||
<!--
|
||||
Documentation
|
||||
=============
|
||||
- https://kb.vmware.com/s/article/2039095
|
||||
- vSphere 5.5: https://docs.vmware.com/en/VMware-vSphere/5.5/com.vmware.vsphere.install.doc/GUID-925370DD-E3D1-455B-81C7-CB28AAF20617.html
|
||||
- vSphere 6.0: https://docs.vmware.com/en/VMware-vSphere/6.0/com.vmware.vsphere.install.doc/GUID-171B99EA-15B3-4CC5-8B9A-577D8336FAA0.html
|
||||
- vSphere 6.5: https://docs.vmware.com/en/VMware-vSphere/6.5/com.vmware.vsphere.security.doc/GUID-171B99EA-15B3-4CC5-8B9A-577D8336FAA0.html
|
||||
- vSphere 6.7: https://docs.vmware.com/en/VMware-vSphere/6.7/com.vmware.esxi.upgrade.doc/GUID-171B99EA-15B3-4CC5-8B9A-577D8336FAA0.html
|
||||
|
||||
Excluded ports from range 5900 - 11999 (both TCP/UDP ports)
|
||||
===========================================================
|
||||
5988 - CIM Server
|
||||
5989 - CIM Secure Server
|
||||
6999 - NSX Virtual Distributed Router
|
||||
8000 - vMotion
|
||||
8042 - VMware HA
|
||||
8043 - VMware HA
|
||||
8044 - VMware HA
|
||||
8045 - VMware HA
|
||||
8080 - vSAN VASA Vendor Provider
|
||||
8100 - vSphere Fault Tolerance
|
||||
8182 - vSphere High Availability
|
||||
8200 - vSphere Fault Tolerance
|
||||
8300 - vSphere Fault Rolerance
|
||||
8301 - DVSSync
|
||||
8302 - DVSSync
|
||||
8889 - CIM Server
|
||||
9000 - vSphere Update Manager
|
||||
9080 - I/O Filter Service
|
||||
|
||||
OpenNebula oned.conf VNC_PORTS configuration
|
||||
============================================
|
||||
VNC_PORTS = [
|
||||
START = 5900,
|
||||
RESERVED = "5988:5989, 6999, 8000, 8042:8045, 8080, 8100, 8182, 8200, 8300:8302, 8889, 9000, 9080, 12000:65535"
|
||||
]
|
||||
-->
|
||||
|
||||
<rule id='0000'>
|
||||
<direction>inbound</direction>
|
||||
<protocol>tcp</protocol>
|
||||
<porttype>dst</porttype>
|
||||
<port>
|
||||
<begin>5900</begin>
|
||||
<end>5987</end>
|
||||
</port>
|
||||
</rule>
|
||||
|
||||
<rule id='0001'>
|
||||
<direction>inbound</direction>
|
||||
<protocol>tcp</protocol>
|
||||
<porttype>dst</porttype>
|
||||
<port>
|
||||
<begin>5990</begin>
|
||||
<end>6998</end>
|
||||
</port>
|
||||
</rule>
|
||||
|
||||
<rule id='0002'>
|
||||
<direction>inbound</direction>
|
||||
<protocol>tcp</protocol>
|
||||
<porttype>dst</porttype>
|
||||
<port>
|
||||
<begin>7000</begin>
|
||||
<end>7999</end>
|
||||
</port>
|
||||
</rule>
|
||||
|
||||
<rule id='0003'>
|
||||
<direction>inbound</direction>
|
||||
<protocol>tcp</protocol>
|
||||
<porttype>dst</porttype>
|
||||
<port>
|
||||
<begin>8001</begin>
|
||||
<end>8041</end>
|
||||
</port>
|
||||
</rule>
|
||||
|
||||
<rule id='0004'>
|
||||
<direction>inbound</direction>
|
||||
<protocol>tcp</protocol>
|
||||
<porttype>dst</porttype>
|
||||
<port>
|
||||
<begin>8046</begin>
|
||||
<end>8079</end>
|
||||
</port>
|
||||
</rule>
|
||||
|
||||
<rule id='0005'>
|
||||
<direction>inbound</direction>
|
||||
<protocol>tcp</protocol>
|
||||
<porttype>dst</porttype>
|
||||
<port>
|
||||
<begin>8081</begin>
|
||||
<end>8099</end>
|
||||
</port>
|
||||
</rule>
|
||||
|
||||
<rule id='0006'>
|
||||
<direction>inbound</direction>
|
||||
<protocol>tcp</protocol>
|
||||
<porttype>dst</porttype>
|
||||
<port>
|
||||
<begin>8101</begin>
|
||||
<end>8181</end>
|
||||
</port>
|
||||
</rule>
|
||||
|
||||
<rule id='0007'>
|
||||
<direction>inbound</direction>
|
||||
<protocol>tcp</protocol>
|
||||
<porttype>dst</porttype>
|
||||
<port>
|
||||
<begin>8183</begin>
|
||||
<end>8199</end>
|
||||
</port>
|
||||
</rule>
|
||||
|
||||
<rule id='0008'>
|
||||
<direction>inbound</direction>
|
||||
<protocol>tcp</protocol>
|
||||
<porttype>dst</porttype>
|
||||
<port>
|
||||
<begin>8201</begin>
|
||||
<end>8299</end>
|
||||
</port>
|
||||
</rule>
|
||||
|
||||
<rule id='0009'>
|
||||
<direction>inbound</direction>
|
||||
<protocol>tcp</protocol>
|
||||
<porttype>dst</porttype>
|
||||
<port>
|
||||
<begin>8303</begin>
|
||||
<end>8888</end>
|
||||
</port>
|
||||
</rule>
|
||||
|
||||
<rule id='0010'>
|
||||
<direction>inbound</direction>
|
||||
<protocol>tcp</protocol>
|
||||
<porttype>dst</porttype>
|
||||
<port>
|
||||
<begin>8890</begin>
|
||||
<end>8999</end>
|
||||
</port>
|
||||
</rule>
|
||||
|
||||
<rule id='0011'>
|
||||
<direction>inbound</direction>
|
||||
<protocol>tcp</protocol>
|
||||
<porttype>dst</porttype>
|
||||
<port>
|
||||
<begin>9001</begin>
|
||||
<end>9079</end>
|
||||
</port>
|
||||
</rule>
|
||||
|
||||
<rule id='0012'>
|
||||
<direction>inbound</direction>
|
||||
<protocol>tcp</protocol>
|
||||
<porttype>dst</porttype>
|
||||
<port>
|
||||
<begin>9081</begin>
|
||||
<end>11999</end>
|
||||
</port>
|
||||
</rule>
|
||||
</service>
|
||||
</ConfigRoot>
|
||||
Loading…
x
Reference in New Issue
Block a user