Jenkins
d9740e9c40
Merge "Remove unnecessary until in register.yml file"
2017-02-22 12:28:06 +00:00
Jenkins
0e5c6b277a
Merge "Start nova-conductor earlier"
2017-02-22 12:27:02 +00:00
Jenkins
3d356b426b
Merge "Run nova-compute and nova-compute-ironic at the same time on kolla-k8s"
2017-02-22 12:14:33 +00: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
Jenkins
df29551f8d
Merge "Disable nova-compute when enable_ironic is yes"
2017-02-21 06:24:03 +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
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
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
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
zhubingbing
394cf342cb
Remove extra spaces
...
Change-Id: I4fcacb2f7537236b538bd4bf8408acf08672790f
2017-02-16 17:07:33 +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
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
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
t.goto
79b4774e68
Fix typo in neutron's default/main.yml file
...
There is an unnecessary condition operator in neutron's
defaults/main.yml which causes pull error.
- Delete an duplicated "or" from neutron-sfc-agent host_in_groups
check condition.
Change-Id: I32626ad83fbca9a17cd89b70ff95d58d23b200d2
Closes-Bug: #1665188
2017-02-16 14:39:54 +09:00
caowei
3e3ab11749
Fix freezer auth issue
...
Change-Id: I14ba906cb688c935351ef296badccf720b0267f0
Closes-Bug: #1665195
2017-02-16 10:27:49 +08:00
Jenkins
55d23e1356
Merge "Fix chrony genconfig"
2017-02-16 02:02:47 +00:00
Jenkins
aac84911af
Merge "Optimize reconfigure action for congress"
2017-02-15 21:21:01 +00:00
Eduardo Gonzalez
e01900b3ce
Fix chrony genconfig
...
Closes-Bug: #1665047
Change-Id: Ief0813e4f505574c9b8eee8a59765dadbac474ed
2017-02-15 17:27:36 +00:00
Jenkins
a0d2962f48
Merge "Disable elasticsearch output when enable_elasticsearch is no in fluentd"
2017-02-15 16:40:07 +00:00
Jeffrey Zhang
2ae1781d0e
Disable elasticsearch output when enable_elasticsearch is no in fluentd
...
Change-Id: I93fe8141a88d6e0600a1f44fe49d96d7816fae87
Closes-Bug: #1664868
2017-02-15 20:12:33 +08:00
caowei
963e407439
Change freezer service type
...
Change-Id: I0ea1927fff651bf8fd64a156b86c1378aa4d9d7c
Closes-Bug: #1664936
2017-02-15 19:02:40 +08:00
Jenkins
5b9744e591
Merge "Add default roles used by Barbican"
2017-02-15 08:58:16 +00:00
Mauricio Lima
6defea46cb
Optimize reconfiguration for collectd
...
Co-Authored-By: caoyuan <cao.yuan@99cloud.net>
Change-Id: I0604d262965b27b8bf6c560238811f81c830ea1a
Partially-implements: blueprint better-reconfigure
2017-02-15 15:37:02 +08:00
Jenkins
b7e1d40030
Merge "Optimize reconfiguration for karbor"
2017-02-15 07:26:09 +00:00
Jenkins
aaba647633
Merge "Change Barbican default secret store to pkcs11"
2017-02-15 05:02:50 +00:00
Jenkins
c028b6fdd1
Merge "Fix X-Forward-Proto Header Deletion"
2017-02-15 02:49:28 +00:00
Serguei Bezverkhi
35fee342f0
Changing ironic-inspector configuration for kolla-kubernetes
...
Changing ironic-inspector configuration for kolla-kubernetes
Change-Id: Ib1ff99d2d58ca9f910b8e68e6076359e2e7ec5a0
Closes-Bug: #1664726
2017-02-14 16:50:51 -05:00
Nenad Radojevic
4385fb682c
Add default roles used by Barbican
...
The default roles used by Barbican are missing.
According to the policy.json the Key Manager
comes with, four roles have to be defined.
Change-Id: I8882c2cf328b62e68797e383b26908540d669629
Closes-Bug: #1657742
2017-02-14 17:06:54 +00:00