228 Commits

Author SHA1 Message Date
Jianghua Wang
e619603bda XenAPI: remove xen tools
The xen tools have been moved to the project of *os-xenapi* since
os-xenapi 0.3.0. We also did some refact work on these tools in
os-xenapi. This commit is to remove these tools from devstack. So
that os-xenapi will be the single place for xen tools.

Change-Id: I4fdbe6bce12dfedd0d1e975ab8dd624ee3740c11
2018-02-23 03:58:56 +00:00
Huan Xie
2a2db2efc5 XenAPI: Remove final references to Integration bridge
The change to remove references of XEN_INTEGRATION_BRIDGE
(If5886e3711765a97f40f20e478f958b988b5a620) unfortunately left some
code which should have been removed.  This remaining code caused an
error in some situations when deploying from scratch (which the CI
avoids for expediency)

Change-Id: Ia568462c9cca8cff8fcfada8148d185609d61a7d
2017-04-11 01:24:37 +00:00
Huan Xie
9e64bad03a Use br-int when XenServer is hypervisor
Previously we use a specific integration bridge for neutron ovs agent
which is running in compute node, but this isn't necessary, this
patch is to remove the specific integration bridge for XenSever and
remove the custom integration bridge definition

Depends-On: I675565e1ea6c887d40d7a53f62968c4aa385ecca

Change-Id: If5886e3711765a97f40f20e478f958b988b5a620
2017-03-22 19:11:34 -07:00
jianghua
5f8bd0e452 Xen: restrict devstack VM use upto 8 vCPUs.
Change-Id: Iea6086a3feb03dff581d9c04560133c4f57a6f6c
Closes-Bug: 1672642
2017-03-16 08:44:44 +00:00
Jianghua Wang
6e49cab091 Xen: support Ubuntu Xenial for xen DevStack
Upgrade xen tool to install Ubuntu Xenial; change the upstart
task to systemd task to finish the OpenStack installation
by using devstack.

Change-Id: I8129923be3c41e7f60e9d32348a5ea8e07d4845b
2017-02-22 19:59:36 +08:00
Huan Xie
ba3c8f48bb Change the way to get conntrack-tools version
In the incoming XenServer, it failed to install conntrack-tools
in Dom0 due to the bash script which is trying to find the correct
CentOS release version to be used in yum command. This patch is to
fix the problem

Change-Id: If7f169e118ccb7c29fc479c361417a916dc40b40
2017-01-15 20:07:04 -08:00
Huan Xie
c608184211 XenAPI: Use XenServer DevStack plugins
Hypervisor XenServer will change to use os-xenapi in the future,
this will need DevStack changes, this patch is to remove install
Dom0 plugins part to our own DevStack plugins.

Change-Id: Ic327135b893a77672fd42af919f47f181e932773
2017-01-09 17:43:24 -08:00
Huan Xie
26edd7b071 Install conntrack in XenServer Dom0
Neutron openvswitch agent running in compute node will control the
actual connection of the VMs in Dom0 via conntrack-tools, but Dom0
doesn't install conntrack-tools RPM by default.
This patch is to add such support with XenServer 7.0 and above.

Change-Id: Iec56db761015d4b7baa5a5f54314f4ff3fa67e02
2016-08-30 01:30:14 +00:00
zhangyanxian
c6f857f49c Fix the typo in the file
Change-Id: I3a3976bdab6743f6d741d39708b01eacf6a01074
2016-07-25 08:45:18 +00:00
Huan Xie
f179eb7c47 Support installing OpenStack on XenServer 7.0
XenServer 7.0 has changed some iso files' name, this made devstack script
install_os_domU.sh failed to install VM before installing OpenStack. This
patch is to fix the problem, make install_os_domU.sh support 7.0 and other
prior versions of XenServer

Change-Id: I49459bfff2b101fc6927eb4578c5eb47cc8c3ad6
2016-06-05 22:38:56 -07:00
Huan Xie
bea1e1954a Set default value and configurable value for integration bridge
When using XenServer as hypervisor, install_os_domU.sh will create
integration bridge for compute node when neutron network is used.
But it should provide a way to allow moving of the VM to another
host (with a different XEN_INTEGRATION_BRIDGE) for easier install.
This patch is to provide the way to let user have the chance to
configure integration bridge themselves

Change-Id: If923a5e978e77fc091d24b6e1fe7a83a3375da09
2016-04-22 06:21:52 +00:00
Balagopal
7ed812c6cd Change "secrete" to "secret"
Apparently this is intentional as a joke on devstack leaking
passwords, but the dual meaning of the word confuses people.  Let's
change it before we get yet another review fixing it.

Change-Id: I3bee03612f6ea197362aab04a37f81043f77f235
2016-03-17 14:53:03 +11:00
Ian Wienand
7ae97298c5 Minor fixes for bashate trunk
We don't have a new bashate release yet, but this fixes some minor
issues when used with bashate trunk.

The only two things triggered are stricter checking of assignment in
local declartions (catches quotes) and one instance of evaluating
arithmetic result in tools/xen/functions.

Therefore, hopefully, this change has no effect!

Change-Id: I3fd5d55236e90c2f2c25243af87adaf0c1b763e2
2016-02-16 14:50:53 +11:00
Steve Martinelli
3567d6103a remove SERVICE_TOKEN from the docs
there are a few lingering instances of SERVICE_TOKEN in the docs
and some of the scripts in tools.

Change-Id: I9d2147eea6639db1f4ea15a259c147eecfc339ff
2016-01-10 01:29:39 +00:00
Huan Xie
cc6af3fc94 XenAPI: add support to use local.conf
XenServer install with devstack doesn't support local.conf, this fix
is to add support for using local.conf and backward-compatibility of
localrc

Change-Id: Ie494e01f8f1ecb8720e14392ef3f12d5a5a01dcd
Closes-Bug: #1528520
2015-12-28 08:56:14 +00:00
Jenkins
d111182f21 Merge "Don't mix declaration and set of locals" 2015-10-14 02:43:52 +00:00
Swapnil (coolsvap) Kulkarni
c988bf6fde Updated configuration and docs for MYSQL_PASSWORD
Updated MYSQL_PASSWORD to DATABASE_PASSWORD in sample
configuration and existing docs

Change-Id: Iafb295a0b7707e08a81e6528620db8543d40f7ae
2015-10-08 14:21:58 +05:30
Ian Wienand
ada886dd43 Don't mix declaration and set of locals
Ia0957b47187c3dcadd46154b17022c4213781112 proposes to have bashate
find instances of setting a local value.  The issue is that "local"
always returns 0, thus hiding any failure in the commands running to
set the variable.

This is an automated replacement of such instances

Depends-On: I676c805e8f0401f75cc5367eee83b3d880cdef81
Change-Id: I9c8912a8fd596535589b207d7fc553b9d951d3fe
2015-10-07 17:03:32 +11:00
jianghua wang
78f6c1d70b tools/Xen: failed to install domU in new XenServer
Current install_os_domU.sh depends on some keywords which are changed in the
next version XenServer which is upgraded to CentOS 7. So with the existing
script to install domU in the new version XenServer, it will always fail.
This patch is to make it to be compatible with all XenServer versions:
1. the output format of "ifconfig" is changed; the fix is to use the ip
   command to retrieve IP address.
2. In XS 6.5 and the previous XS, the "xe-guest-utilities" package file name
   is as "xe-guest-utilities_<version>_<arch>.deb" but now it delivers a
   single file for all Arch's and the file name is
   "xe-guest-utilities_<version>_all.deb". In order to make it to be
   compatible, the fix will try to search the old file name pattern by
   default. If it does't exist, then try to search the new file name pattern.

Change-Id: I893e89e42a5ef7dd079b571ea308f318c9befc9e
Closes-Bug: #1494241
2015-09-24 09:07:26 +01:00
John Hua
a4693b5dea Add/Overwrite default images in IMAGE_URLS and detect duplicates
IMAGE_URLS could be set both in localrc with customization or stackrc by
default. By setting DOWNLOAD_DEFAULT_IMAGES, user could choose to add
default images to IMAGE_URLS or overwrite them.

As uploading duplicate images will cause a "409 Conflict" error, a
duplicate detection will expose it earlier.

Care needs to be taken that you don't end up with a duplicate image, so
clean up Xen's README.

Depends-On: I6fbae12f950a03afab39f341132746d3db9f788c
Change-Id: I3ca4e576aa3fb8992c08ca44900a8c53dd4b4163
Closes-Bug: #1473432
2015-08-27 10:33:26 +01:00
John Hua
6e121ff53e Remove unused files from tools/xen.
Most of unused files were used with build_domU_multi.sh which has been 
replaced by build_xva.sh. Besides tools/xen/scripts/templatedelete.sh 
was created for convenience purposes and now not in use.

Change-Id: I4282c779629e3413ee3cd3ff134c3b7b19eee487
Closes-Bug: #1470535
2015-07-08 05:59:26 +00:00
Bob Ball
40c5ea67d3 XenAPI: Increase OpenStack DomU usage again
Devstack has continued to grow in memory requirements and now we cannot
reliably fit in 4GB, with several services being unable to start.  Increase
the minimum for DomU to 6GB to leave room for virtual machines

Change-Id: Idbdfa1f36015b6af347d1ce27eb28baa360af5ef
2015-05-28 06:42:03 +01:00
Jens Rosenboom
9fd75f57fd Update default cirros version
Update the default CIRROS_VERSION to 0.3.4, which has better support
for IPv6 and some other bugfixes.

Co-Authored-By: Scott Moser <smoser@ubuntu.com>
Change-Id: I03ee6e1403680fb6c421225a7cadaf8a82edf702
Depends-On: Iac9f108d947ff4a51f99c6e8ad9d1ac5b32c000a
2015-05-07 16:06:02 +02:00
Bob Ball
1340ee72bf XenAPI: Default JEOS VM to only use 1GB RAM
While Devstack needs 4GB RAM (or more!) the JEOS
used as the base for the Devstack VM for XenServer
needs much less.  Allowing the initial install to
use 1GB means we have lower requirements overall

Change-Id: Iecaeeb4db0dffcc43c5532b5d57cb041d47047a6
2015-03-06 21:15:59 +00:00
Bob Ball
e356d8cff6 XenAPI: Recommend using xl console rather than vncviewer
Some vncviewers do not support the -via option, so default to suggesting
xl console.  XenCenter continues to be an option for those running
Windows.

Change-Id: I1e53fd33d309e30a60031965e589167dcbacfbbe
2015-02-17 15:05:34 +00:00
Bob Ball
0df75a7288 XenAPI: Move where os-vpx is set
os-vpx is only true after we know it's not a JEOS we're creating
Move the location we set the os-vpx flag to as we're starting to
prepare the VM for devstack

Change-Id: If736f3a7de171b8090b0bb905e04accb70470a90
2015-02-12 11:59:46 +00:00
Bob Ball
5b9adb60de XenAPI: Move some boot-time functions to install-time
The boot-time script (prepare_guest.sh) is one of the less reliable parts
of the install process.  This change enables SSH into the host as well as
reporting of the IP address.  This significantly helps debugging issues
now and enables moving of all other setup code to being executed over SSH.

Change-Id: I1555f1d91353ba8b75e2de4607df33ee20307a6e
2015-02-11 11:15:02 +00:00
Bob Ball
347e30877b XenAPI: Use round-robin mirror for Ubuntu
ANL has discontinued their Ubuntu mirror.  Update the target
to be the official round-robin mirror which should be more stable long-term

Change-Id: I1271301d96a44888f45664537435e31dd38ff30d
2015-02-09 12:02:51 +00:00
Bob Ball
f35e95706c XenAPI: Replace remaining instances of 'devstack.succeeded'
Commit I05990c7154366350b0f9cc3e6c70d6f34238486f was incomplete
and left two references to the, now replaced, devstack.succeeded.

The impact of this is that the XVA always claims that devstack failed
to run when actually the run may have been successful

Change-Id: Ie4ac673011d77a9edc8923db94d914efe9f45d5d
2015-01-26 14:13:02 +00:00
Bob Ball
1e3a5d2d6c XenAPI: Use SCREEN_LOGDIR rather than assuming a static value
This value was defined in Citrix's install-devstack-xen script, so
only worked for those using that script.

Change-Id: Iab63389f41760865f2b67f6dccd57d774e889905
2015-01-16 14:50:40 +00:00
Bob Ball
0686dae661 XenAPI: Fix another race condition
Fix it properly this time by forcing a PID from run.sh and using that to track.

A second issue is that upstart may run services twice, introduce a flock test
to ensure that we only run stack.sh once as running in parallel causes issues.

Change-Id: I05990c7154366350b0f9cc3e6c70d6f34238486f
2015-01-16 13:53:47 +00:00
Bob Ball
be485221b3 XenAPI: Simplify installed packages
Remove duplicate packages.
pip is handled by devstack, so don't try and install it here.

Change-Id: I6f22e0f86ae071d30bf69de9ed5dec6b28ebc92b
2014-12-12 13:14:46 +00:00
Bob Ball
f3b49e23b0 XenAPI: Add another plugin directory
Buildroot on 64-bit systems may use /usr/lib64 to store the XAPI plugins
Add this as an option to search for.

The list is getting of acceptable paths is getting longer but some work is going
on in XAPI to allow us to query for this path, which will mean we can get
rid of this list in future.

Change-Id: I79aafb6a86032c7ab04937c9e9bec08661ecdefa
2014-12-09 17:37:03 +00:00
Jenkins
0f765ff21a Merge "XenAPI: workaround for unsupp. associative arrays" 2014-10-31 11:23:36 +00:00
Jenkins
b95c4e65ec Merge "XenAPI: Remove non-used functions" 2014-10-31 11:23:33 +00:00
Jenkins
ca6156bc03 Merge "XenAPI: move Neutron plugin install to domU" 2014-10-31 11:23:29 +00:00
Mate Lakat
518fb760d3 XenAPI: workaround for unsupp. associative arrays
Dom0's bash does not support associative arrays, however we source
`functions` and therefore our scripts fail. This change breaks the
dependency of dom0 tools on domU functions.

Fixes bug: 1379804

Change-Id: I229e2d5f07070a9236ec612d4032c94c4361a9f6
2014-10-29 18:10:43 +01:00
Mate Lakat
dec5ca0f20 XenAPI: Remove non-used functions
Remove the no-longer used functions that were used to download plugins
to dom0.

Change-Id: I8dfd476781b683a8378efdae45d3cb1b46e7063c
2014-10-29 17:31:45 +01:00
Mate Lakat
6df648920c XenAPI: move Neutron plugin install to domU
Use the same mechanism as used for nova plugin installation, thus
avoiding the need for variables in dom0. This change will also help to
move XenServer CI to neutron in the future, as the dom0 part of the
script is not executed there.

With this change, the neutron related network will always be created and
attached even if the user wants to use nova-network.

Change-Id: I8669c94e9f0aacce2990469dbabde1ff702a2769
2014-10-29 17:31:26 +01:00
Mate Lakat
e35785d910 XenAPI: Always update proxy settings
If a user wants to re-use an xva just with different proxy settings, he
can now do it, as this change will always update /etc/apt/apt.conf to
reflect the settings in the user's localrc.

Change-Id: I8a6e9c88304bc887ea8269d946e89a5ba258b126
2014-10-17 13:21:18 +02:00
Jenkins
fa893dbb49 Merge "XenAPI: Always update apt sources" 2014-10-17 11:02:42 +00:00
Jenkins
664830a16f Merge "XenAPI: Add exit point after JEOS installation" 2014-10-16 16:36:40 +00:00
Mate Lakat
fff07e864e XenAPI: Always update apt sources
If an appliance is used as a base OS, the user might want to use that in
a different region. With this change we always update the used mirrors
in the template.

Change-Id: I7a119664efac1124e54064311c243c63c2a7944b
2014-10-15 19:40:00 +02:00
Mate Lakat
a1707c7ef0 XenAPI: Fix vimrc
DevStack installs a default minimal .vimrc file for the stack user.
Unfortunately the `syntax on` config line is not recognised by the vim
installed in DomU. It results in an annoying message being displayed
whenever the user is using vi. To avoid this issue, removing the `syntax
on` line.

Change-Id: I224465cc3cdba3464ea0a9a751f250ecb6ddc9f3
2014-10-15 19:38:01 +02:00
Mate Lakat
2a324dd2ec XenAPI: Add exit point after JEOS installation
If the user only want to run the installation of Ubuntu - to export the
template as an xva, it just needs to specify a non-empty value for:

EXIT_AFTER_JEOS_INSTALLATION

And the script will exit after the jeos template has been created.

Change-Id: I558e2f2b18ee23c15c7e46e2f7e74543cf26b750
2014-10-15 19:37:28 +02:00
Davanum Srinivas
690e3c2574 Fix Typos found with misspell
git ls-files | grep -v locale | misspellings -f -

Change-Id: I0dc56ba64ae4bdc681ccf4a1d2d23238f541650d
2014-10-05 20:06:33 -04:00
Jenkins
8e087fa83b Merge "XenAPI: Upgrade built-VM to Trusty" 2014-09-30 07:08:48 +00:00
Bob Ball
3cd1771408 XenAPI: Upgrade built-VM to Trusty
If you're not using an XVA then the built-VM was previously Saucy, which is
not supported by openstack any more.

Change-Id: I1040d9e43d517582e76f2e1df787986b5ffbc42c
2014-09-29 12:55:10 +01:00
Jenkins
114dc2adbf Merge "XenAPI: Fix race condition waiting for VM to start" 2014-09-29 10:28:57 +00:00
Bob Ball
0be63f3979 XenAPI: stackrc now depends on nproc
Install it automatically in the devstack DomU

Change-Id: Ie282dd128ebc92377d85800585962bc8767483fe
2014-09-23 11:24:04 +01:00