7049 Commits

Author SHA1 Message Date
Mark Goddard
aa8215c5ee ironic_pxe bootstrap should run on all hosts
Most bootstrap actions use the run_once flag to run on a single host
as they typically involve service-global operations such as database
syncs. The ironic_pxe container bootstrap is different, as it copies
pxelinux files into the ironic_pxe Docker volume. This should be done
on all hosts but currently is only done on one host.

This change performs the ironic_pxe bootstrap on all hosts in the
ironic-pxe group.

Change-Id: Iffd34e6ff26a0ba5140e5d477418cc8aebcdac62
Closes-Bug: #1667153
2017-02-22 11:02:18 +00:00
Mark Goddard
c37c1a5879 ironic-dnsmasq should use ironic-inspector group
The ironic_dnsmasq container is currently tied to the ironic-conductor
Ansible group. It is required only for Ironic inspector and should
really either be tied to the ironic-inspector group or have a new
ironic-dnsmasq group defined for it. This problem means that if all
hosts are removed from the ironic-inspector group I will still have an
ironic_dnsmasq container deployed.

This change uses the ironic-inspector group to determine where to place
the ironic_dnsmasq container.

Change-Id: I6af3f402795107b8b9d7a1619722f12cbf496257
Closes-Bug: #1666982
2017-02-22 10:29:30 +00:00
Mark Goddard
156b317c5f ironic_dnsmasq doesn't support reconfiguration
Currently the ironic_dnsmasq container does not support
reconfiguration. This change adds support for reconfiguration of
ironic_dnsmasq.

Change-Id: I7f121dca7d32e0b28c7531378dd0eef03ae4f1ce
Closes-Bug: #1667090
2017-02-22 10:17:35 +00:00
zhuzeyu
8da7dc30b2 Fix the error in document
Change-Id: I72e14bd2bb306498f5e010e8f9309e23243db00e
2017-02-22 17:47:35 +08:00
Jenkins
d79c97eb26 Merge "Do not failed when there is no nova-compute is running" 2017-02-22 02:50:06 +00:00
Jeffrey Zhang
7e9e5fd75a Start nova-conductor earlier
nova-compute will try to connect nova-conductor when upgrade.level is
auto. So nova-conductor need run more earlier. Otherwise, nova-compute
will failed to connect nova-conductor through message queue.

Closes-Bug: #1665836
Change-Id: If6296a84305bc283fb071b9650e629c6b1b71e61
2017-02-22 10:45:09 +08:00
Jeffrey Zhang
bc9130d822 Run nova-compute and nova-compute-ironic at the same time on kolla-k8s
In kolla-kubernetes, nova-compute-ironic is ran with a separate virtual
interface with a different hostname. So it is OK to run nova-compute and
nova-compute-ironic on the same node.

Change-Id: I3b0f12f128af8210bc97502dbc01469f619dd1ac
2017-02-22 09:59:04 +08:00
Jenkins
cb5a2878ee Merge "Option "use_neutron" from group "DEFAULT" is deprecated for removal" 2017-02-21 16:04:05 +00:00
Jenkins
bb52076329 Merge "Add Loading nfs_shares file without .j2 extension in cinder config" 2017-02-21 16:02:06 +00:00
Chao Guo
03ddc1be8e Add empty volume item check in kolla_docker module
A empty docker volume item will cause start_container to fail.
This bug is not triggered in current kolla deployment scripts, but
only if you pass a empty volume item to kolla_docker module.
E.g. Using a if expression in items of volumes list while calling
start_container. Like the one in start.yml of iscsi and cinder.

Change-Id: I389246fb9650ab5304463e943459ecb68706167f
2017-02-21 17:17:39 +08:00
Jenkins
df29551f8d Merge "Disable nova-compute when enable_ironic is yes" 2017-02-21 06:24:03 +00:00
Jenkins
225b1a1dbb Merge "Replace "ara generate" by "ara generate html"" 2017-02-20 17:19:46 +00:00
Jenkins
a147fef68b Merge "Fix typo in nova-serialproxy handler" 2017-02-20 11:58:03 +00:00
Jenkins
80bcaf10e4 Merge "Fix wrong module argument name for kolla_toolbox" 2017-02-20 10:17:36 +00:00
Jeffrey Zhang
374774c254 Fix typo in nova-serialproxy handler
Change-Id: Ied1af4c8ab3012fc5893905795590b53227fb26e
Closes-Bug: #1666123
2017-02-20 07:26:43 +00:00
Jeffrey Zhang
af2acb25e5 Do not failed when there is no nova-compute is running
In ironic environment deployment, the compute nodes info will be empty
until ironic node is created. There are also some case that user just
want deploy without any nova-compute.

Also enable auto discover hosts feature. This is useful for small
environment.

Closes-Bug: #1666031
Change-Id: I6f3d1c3668452a404875aa5621ee99b2b41e28f0
2017-02-20 01:11:03 +08:00
Jeffrey Zhang
10bc344308 Fix wrong module argument name for kolla_toolbox
should be module_extra_vars rather than module_extra_args.

Change-Id: I31479d54526cba1ae408126bae3cec06fb52deb8
Closes-Bug: #1666026
2017-02-20 00:15:05 +08:00
Jeffrey Zhang
f0c61d4b6d Disable nova-compute when enable_ironic is yes
Change-Id: Icb77da008247609e9e1ce45770c9925d9b416739
Closes-Bug: #1665905
2017-02-19 00:47:16 +08:00
caoyuan
504adc36b5 Update the "ouput" to "output"
TrivialFix

Change-Id: Ie81206ce62fcab055727a4765351df5cc0c6de46
2017-02-18 20:46:25 +08:00
Jenkins
248176f71d Merge "Fixed a typo in tg-agent" 2017-02-18 12:03:09 +00:00
Jeffrey Zhang
5adb72baa7 Option "use_neutron" from group "DEFAULT" is deprecated for removal
Its value may be silently ignored in the future.

Change-Id: I594f36d56d13b417d1ef315266177b1dcbdead78
2017-02-18 10:42:42 +08:00
David Moreau-Simard
3889bbe6f3 Replace "ara generate" by "ara generate html"
The newest version of ARA, 0.11, deprecated "ara generate" in favor
of "ara generate html". "ara generate" will be removed sometime in
the future so let's adjust it right away.

Change-Id: I31bff0a7e130c329da44b46506f5b12fa8d6deb8
Closes-Bug: #1665746
2017-02-17 14:15:27 -05:00
Jenkins
156118738a Merge "Support kolla-ansible installed in a virtualenv" 2017-02-17 16:29:59 +00:00
Jenkins
defe30742f Merge "Fix genconfig for ironic-dnsmasq for kolla-kubernetes" 2017-02-17 12:07:31 +00:00
Alicja Kwasniewska
be6d9e8aa5 Fixed a typo in tg-agent
It should be td-agent.

TrivialFix

Change-Id: I4b7d573cc684d28515fa944186a04bc26efab521
2017-02-17 04:34:58 +00:00
Jenkins
dd35292aa6 Merge "Fix typo in all.yml" 2017-02-17 03:36:10 +00:00
Serguei Bezverkhi
0cd872c9e5 Fix genconfig for ironic-dnsmasq for kolla-kubernetes
Fix genconfig for ironic-dnsmasq for kolla-kubernetes

Change-Id: Icdf6f0aabb2b587437238e52305b06f424044546
Closes-Bug: #1665343
2017-02-16 22:33:05 -05:00
Jenkins
8748ceee70 Merge "Change python interpreter" 2017-02-17 02:42:16 +00:00
Jenkins
266cb8f3c7 Merge "Remove extra spaces" 2017-02-16 23:36:58 +00:00
Abel Lopez
8b90fb6d47
Change python interpreter
There is inconsistent use of either `/usr/bin/python` or
`/usr/bin/env python`. This makes for unexpected results when a
user might be using a virtualenv.

Change-Id: Ibb030f920a8869f9113ade70b66a921cc815060d
2017-02-16 13:39:36 -08:00
Jenkins
1929889e8b Merge "Update production architecture guide for formatting" 2017-02-16 19:51:29 +00:00
Mark Goddard
e6b9249556 Use correct inventory file for Bifrost
Bifrost now targets the play in the install.yml playbook at the
target Ansible group instead of localhost.

This change uses the target inventory file to pick up this group
and avoid a 'noop' playbook.

Change-Id: I850993c9d824b59cfb1eec0d8286098d021d4d5f
Closes-Bug: #1665415
2017-02-16 18:34:56 +00:00
zhubingbing
394cf342cb Remove extra spaces
Change-Id: I4fcacb2f7537236b538bd4bf8408acf08672790f
2017-02-16 17:07:33 +00:00
Mark Goddard
dbc5967f73 Support kolla-ansible installed in a virtualenv
Currently it is not possible to use kolla-ansible when it has been
installed in a virtualenv. Virtualenv-based installation may be
desirable when a suitable system package (e.g. RPM, .deb) is not
available, as it allows the user to install kolla-ansible and its
dependencies without affecting the system-wide packages.

This change checks for the presence of the $VIRTUAL_ENV environment
variable to determine whether we are running in an virtualenv. Since
kolla-ansible is not a python script, this comes with the caveat that we
must source the virtualenv activation script ($VIRTUAL_ENV/bin/activate)
before executing kolla-ansible.

Change-Id: I19efb96605bee3b16df3a0b78cd681e5f15499f6
Closes-Bug: #1530319
2017-02-16 15:31:58 +00:00
Jenkins
2825e18fc3 Merge "Fix BASEDIR because of new kolla-ansible project name" 2017-02-16 15:13:14 +00:00
Eduardo Gonzalez
053fb379ec Make service_plugins and extensions more configurable
Ease new service_plugins and extension integration as well
as improve code readiness.

Change-Id: I9924de51a70e9342c9ac56113c9fbd148a58c322
2017-02-16 13:07:35 +00:00
Jenkins
02cfdeeaa4 Merge "Fix extension_drivers check in ml2" 2017-02-16 12:33:36 +00:00
Jenkins
a63c148ec5 Merge "Optimize reconfigure action for trove" 2017-02-16 12:13:38 +00:00
zhuzeyu
b2da75f60c Update production architecture guide for formatting
Change-Id: Ic5a9ec189949c0f6f986f3ff4f48266b7548d8e5
partially-implements: blueprint documentation-rework
2017-02-16 19:57:59 +08:00
Jenkins
8a18a3b72b Merge "Optimize reconfiguration for collectd" 2017-02-16 11:49:40 +00:00
Jenkins
4d00421053 Merge "Optimize reconfigure action for manila" 2017-02-16 11:49:35 +00:00
Jenkins
f671fdf5a0 Merge "Fix haproxy log not writable in upgrade" 2017-02-16 11:49:29 +00:00
Jenkins
527fc00533 Merge "Optimize reconfiguration for designate" 2017-02-16 11:49:22 +00:00
Jenkins
a703348e8f Merge "Fix typo in neutron's default/main.yml file" 2017-02-16 08:56:00 +00:00
Saverio Proto
e2316dd552 Fix BASEDIR because of new kolla-ansible project name
In commit 177fbea79a1babdcd4e8230341380d373eef6df4 the project
was renamed to kolla-ansible, and this broke the BASEDIR
in the kolla-ansible wrapper.

Closes-bug: #1665262

Change-Id: I89fe15e5723f39f453a8173f7ced3f623a8bccc5
2017-02-16 09:18:34 +01:00
Jenkins
c884bbcbbd Merge "Change freezer service type" 2017-02-16 08:09:56 +00:00
Jenkins
16f1b5963c Merge "Fix freezer auth issue" 2017-02-16 08:02:58 +00:00
Eduardo Gonzalez
50232c3b18 Fix extension_drivers check in ml2
Use neutron_extension_drivers to add the option only when
a extension_driver is enabled.

Change-Id: I44a4e8c95c331fff0b66d18c11566211408fbb85
Closes-Bug: #1665258
2017-02-16 07:54:02 +00:00
zhubingbing
87b8dae67e Fix haproxy log not writable in upgrade
Change-Id: Icddd27ef0f5041ace848eec75e732143635c1001
Closes-Bug: #1665005
2017-02-16 07:36:54 +00:00
Jenkins
adfb956729 Merge "Secret generate fail with hostvars is undefined" 2017-02-16 07:14:40 +00:00