1640 Commits

Author SHA1 Message Date
caowei
f581c81ec6 Add enable_elasticsearch option
TrivialFix

Change-Id: Id3bbe547637386216a1001c729b277439fbe114f
2016-09-22 23:09:01 +08:00
Jeffrey Zhang
0af4dc86bc Fix idempotent for initializing toolbox container task
TrivialFix

Change-Id: I643940d04ec0c2ffeb95816dde5d1438829c7464
2016-09-22 14:06:28 +00:00
Jenkins
9d7ba661f3 Merge "Create the heat_stack_user/owner role in the heat role" 2016-09-22 09:28:50 +00:00
Jenkins
f0d8b12930 Merge "Only enabled services log files" 2016-09-22 08:16:24 +00:00
Jenkins
ea7b268242 Merge "Remove ansible serial: option for haproxy and rabbitmq." 2016-09-22 08:01:06 +00:00
Jenkins
62c3643f4a Merge "Allow a custom haproxy configuration file" 2016-09-22 07:48:16 +00:00
Jenkins
eca14f6469 Merge "Add fwaas_driver.ini file to neutron-vpnaas-agent container" 2016-09-22 07:05:39 +00:00
zhubingbing
f13b267c88 add etcd reconfigure content and do_reconfigure file
Closes-bug: #1624881

Change-Id: I1901089b09a7c0e519243f9f6399566a5f5d0d31
2016-09-22 04:07:09 +00:00
Jenkins
ce3abeb0eb Merge "Allow use of database for Horizon sessions" 2016-09-22 04:00:28 +00:00
Jenkins
200ac2140e Merge "Fix senlin api bind host" 2016-09-22 02:53:21 +00:00
Jenkins
bd4d31fd34 Merge "missing space breaks haproxy from starting" 2016-09-22 02:52:04 +00:00
Jenkins
bb617a67ff Merge "Allow operators to provision multiple physical networks" 2016-09-21 20:05:45 +00:00
bjolo
419454c6b6 missing space breaks haproxy from starting
TrivialFix

Change-Id: I11efb23a51d424710cdb3bab520b572486b16be6
2016-09-21 21:43:10 +02:00
Jenkins
c8329d884f Merge "Fix murano auth issue" 2016-09-21 16:41:39 +00:00
Jenkins
717429bb22 Merge "Allow a custom keepalived configuration file" 2016-09-21 16:38:17 +00:00
Jenkins
90946af865 Merge "Cinder cannot use external non-LVM iSCSI storage" 2016-09-21 16:38:09 +00:00
Jenkins
5e0fe095b0 Merge "Add "---" into some files of yaml" 2016-09-21 15:11:32 +00:00
Jenkins
47894bfaec Merge "Delete extra spaces in baremetal install.yml" 2016-09-21 13:54:10 +00:00
Jenkins
389f31e9e5 Merge "Use ansible_version when available for precheck" 2016-09-21 13:44:51 +00:00
James McCarthy
d5e5700fab Remove ansible serial: option for haproxy and rabbitmq.
By having serial in site.yml for these roles will mean (particularly
during an upgrade) that tasks can be executed out of the intended
order across hosts, leading to unexpected results.

Change-Id: I44f0c66c445d853a2e4af69119562f13b4424936
Closes-Bug: #1626096
2016-09-21 14:34:37 +01:00
Vladislav Belogrudov
b1f986c349 Cinder cannot use external non-LVM iSCSI storage
Currently Cinder enables iscsid service only when LVM is choosen as
backend. This fix will allow to specify external iSCSI storage via
configuration add-on and to run iscsid independently of LVM settings.

Change-Id: Iaae0f8025534e5ab1c5f9d5e812a7d41129915ef
Closes-Bug: 1614125
2016-09-21 12:28:07 +00:00
caoyuan
a071bce07b Add "---" into some files of yaml
TrivialFix

Change-Id: Id2cd736f136068514f26977b434b15a8b1ffc8be
2016-09-21 11:52:20 +00:00
Paul Bourke
d1673ad173 Allow operators to provision multiple physical networks
Currently Kolla operators are restricted to configuring one physical
network (physnet1).

This change along with ml2_conf.ini augmentation can be used to setup
multiple physical networks in openvswitch.

E.g. To configure two physical networks, physnet1 and physnet2, with
ports eth1 and eth2 associated respectively:

In /etc/kolla/globals.yml, set

neutron_bridge_name: "br-ex,br-ex2"
neutron_external_interface: "eth1,eth2"

In /etc/kolla/config/neutron/ml2_conf.ini

[ovs]
bridge_mappings = physnet1:br-ex,physnet2:br-ex2

Co-Authored-By: Mick Thompson <michael.a.thompson@oracle.com>
Closes-Bug: #1625700
DocImpact

Change-Id: I9454ca98d9b058368129123109ccc56f95519874
2016-09-21 09:14:47 +00:00
Eduardo Gonzalez
9e324268d0 Fix senlin api bind host
Change-Id: I4f24bcc69e02eaa961b5791b3986e969368c50a8
Closes-Bug: #1625691
2016-09-21 07:23:14 +02:00
Eduardo Gonzalez
6f58b12d46 Fix tempest missing spaces
Apply a clear syntax adding missing spaces

TrivialFix
Change-Id: I4046ffc43d58db0b667e661aec83714bc67d8dbb
2016-09-20 17:37:03 +02:00
Christian Berendt
1116ae3f66 Add fwaas_driver.ini file to neutron-vpnaas-agent container
This solves the following issue:

oslo_config.cfg.ConfigFilesNotFoundError: Failed to find some config
files: /etc/neutron/fwaas_driver.ini

Change-Id: I606e591057574ca113f2cba18618f455f7c36bc6
Closes-bug: #1625672
2016-09-20 16:57:48 +02:00
Christian Berendt
4e30d0f405 Allow a custom keepalived configuration file
TrivialFix

Change-Id: If63053d707e0e6642883745c702d13b63093131a
2016-09-20 16:43:47 +02:00
Christian Berendt
19ed74d638 Allow a custom haproxy configuration file
TrivialFix

Change-Id: I5ebb8bc42fa9483adfb397ba1856c750a3b70a7b
2016-09-20 16:41:52 +02:00
Jenkins
f6b03676db Merge "run_once Checking mongodb backend for ceilometer" 2016-09-20 12:26:51 +00:00
Jenkins
ee7ce6eebd Merge "Deprecate old auth parameters of ironic in nova.conf" 2016-09-20 12:26:44 +00:00
Jenkins
aa378bfa3a Merge "fix horizon fernet container" 2016-09-20 12:26:37 +00:00
Jenkins
a5527505c8 Merge "Fix Keystone CADF notifications" 2016-09-20 12:26:26 +00:00
Jenkins
b7ea5ed91e Merge "Allow genconfig to work with kolla-kubernetes and ceph" 2016-09-20 12:17:45 +00:00
Jenkins
00d0e1bc39 Merge "Set ownership of barbican configuration files to barbican" 2016-09-20 09:48:26 +00:00
Jenkins
b74c8d19d4 Merge "Repair swift reconfiguration" 2016-09-20 09:47:37 +00:00
liyingjun
2d634e5eb3 Fix murano auth issue
According to installation guide from murano[1] and devstack sample config[2],
some of the configurations for keystone auth need to be changed.

[1]: http://docs.openstack.org/developer/murano/install/manual.html#install-the-api-service-and-engine
[2]: https://github.com/openstack/murano/blob/master/devstack/plugin.sh#L187-L194

Change-Id: I01f9fcf3d6eb849392c4717f8e4c78be069351a2
Closes-bug: #1624957
Closes-bug: #1621693
2016-09-20 09:05:21 +00:00
caowei
2d97299051 Delete extra spaces in baremetal install.yml
TrivialFix

Change-Id: I2004b234520aa16ce2a76d8996cfb9d1a8174439
2016-09-20 10:31:40 +08:00
ZhongShengping
2042ad2850 Deprecate old auth parameters of ironic in nova.conf
The auth parameters `admin_username`, `admin_password`,
`admin_tenant_name` and `admin_url` of the [ironic] config
option group are now deprecated and will be removed in a
future release. Using these parameters will log a warning.
Please use `username`, `password`, `project_name `and
`auth_url` instead.

Change-Id: I9e383788e35b83888b3b5cf927f67b0f3b4ef54b
Closes-Bug: 1619266
2016-09-20 08:44:23 +08:00
Kevin Fox
08146dc3b6 Allow genconfig to work with kolla-kubernetes and ceph
TrivialFix

Change-Id: If3b975710425a88f5cc8df016a009e5e5b413ca5
2016-09-19 17:02:24 -07:00
Kevin Fox
ea0e8546ae Fix Keystone CADF notifications
* use template for transport_url that is working for kolla-kubernetes
* use transport_url parameter in DEFAULT section

Co-authored-by: Christian Berendt <berendt@betacloud-solutions.de>

Change-Id: I800b5bc4c178b5df4f208ee50944e2806fd6a7c1
Closes-bug: #1625352
2016-09-19 22:29:30 +02:00
Jeffrey Zhang
c3f2be5928 fix horizon fernet container
keystone-fernet container need keystone.conf file

TrivialFix

Change-Id: If4a75a4d9e88350963c31190bc09cee4862aa34d
2016-09-20 03:41:27 +08:00
Jeffrey Zhang
873551030a Add pulling ceilometer-collector image
TrivialFix

Change-Id: I72670b61c50ff30a6f9c17e99b60e4e99529c062
2016-09-20 03:34:56 +08:00
bjolo
c28a0cff7e run_once Checking mongodb backend for ceilometer
TrivialFix

Change-Id: I54151df7f869e0a7915ce6361eda8dfefe5d1870
2016-09-19 21:07:44 +02:00
Christian Berendt
6bc976aa07 Set ownership of barbican configuration files to barbican
Change-Id: I6fe7f0928812f816080ced76dec2659f2094276d
Closes-bug: #1625317
2016-09-19 20:58:06 +02:00
Jenkins
1863399686 Merge "Checking valid fernet expiry only need to run once" 2016-09-19 16:53:59 +00:00
Bartłomiej Daca
27621351ac Repair swift reconfiguration
Change the conditions order in when statement.

TrivialFix

Change-Id: Ied9907ff25b66de3fd43502a920a88af8ff0cacd
Closes-Bug: #1625256
2016-09-19 18:46:13 +02:00
Andrew Widdersheim
e775958354 Use ansible_version when available for precheck
Use the ansible_version variable introduced in Ansible 1.8. It is a far
more accurate check.

TrivialFix

Change-Id: I1265ca3de583ff6f9335b8e5e8fe4ea4aadf565b
2016-09-19 12:33:50 -04:00
bjolo
10bfda6240 Checking valid fernet expiry only need to run once
TrivialFix

Change-Id: I4e84ac4e51a976ad132aa78b175855bed1d4bb20
2016-09-19 15:21:57 +00:00
Jenkins
310180db04 Merge "Optimized the serial upgrade and reconfigure" 2016-09-19 15:16:13 +00:00
Jenkins
fc97971f40 Merge "fix config file permission to ironic instead of root" 2016-09-19 14:36:14 +00:00