5339 Commits

Author SHA1 Message Date
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
d10015dbea Merge "Install cinder related package for glance" 2016-09-20 12:27:03 +00: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
Jiri Stransky
20751763a2 Fix base CentOS repository keys
Fix typo in variable name ("yup" instead of "yum"), which means we now
import the repo keys we intended to. Furthermore we no longer try to
import EPEL key in that very spot, as it should be imported after
epel-release is installed, which already happens later during the base
image build.

CentOS/EPEL keys in the image before this patch:

()[root@6843e7e136cf ~]# rpm -q gpg-pubkey --qf '%{summary}\n' | grep -i -E '(centos)|(epel)'
gpg(CentOS-7 Key (CentOS 7 Official Signing Key) <security@centos.org>)
gpg(Fedora EPEL (7) <epel@fedoraproject.org>)

With this patch:

()[root@64a6ae7d0347 ~]# rpm -q gpg-pubkey --qf '%{summary}\n' | grep -i -E '(centos)|(epel)'
gpg(CentOS-7 Key (CentOS 7 Official Signing Key) <security@centos.org>)
gpg(CentOS Storage SIG (http://wiki.centos.org/SpecialInterestGroup/Storage) <security@centos.org>)
gpg(CentOS Virtualization SIG (http://wiki.centos.org/SpecialInterestGroup/Virtualization) <security@centos.org>)
gpg(Fedora EPEL (7) <epel@fedoraproject.org>)

Change-Id: I5cd22a887282e5de199a809b0798a439ce1a99e7
Closes-Bug: #1625585
2016-09-20 13:27:29 +02: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
MD NADEEM
92c828b99c Remove all bytcode & objectcode before running tox
Currently __pycache__ directory, which also holds
python bytecode is not deleted when running tox.
TrivialFix

Change-Id: I0fdcf9a3f9b01cee813eefdbfe29d208dd67f826
2016-09-20 12:09:30 +05:30
Jenkins
af9ea973e8 Merge "Add pulling ceilometer-collector image" 2016-09-20 06:14:57 +00:00
Jeffrey Zhang
156abd6b6a Remove no-cache option in build.py
no-cache is marked for removal. we should move to cache parameter
instead. Ie6d5ab380a22c32eb6a5cee29ff7912e9f4cfe74 handle this parameter
for mistak.

TrivialFix

Change-Id: I4a6bc3eca07e9930381091fcf735529019523975
2016-09-20 13:48:49 +08:00
Jenkins
e51c83f991 Merge "Install extra packages for gnocchi using setuptools extra feature" 2016-09-20 04:34:05 +00:00
Jenkins
55d4c5ff73 Merge "Fix using rhel as a base build image" 2016-09-20 04:28:10 +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
Andrew Widdersheim
ccc68d78e1 Update EPEL version in base
Update to epel-release 7-6. Also, move from HTTPS to HTTP in the RHEL
builds to match what is happening in Oracle Linux. Seems as though HTTPS
does not work any longer.

TrivialFix

Change-Id: Icc457a333acdd5cc5b1e124d4308c4af1eb8d2cc
2016-09-19 18:30:38 -04: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
Jenkins
041d5174ea Merge "Added enable_option for some services" 2016-09-19 16:50:04 +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
Andrew Widdersheim
879b446398 Fix using rhel as a base build image
Using rhel as a base build image is not a supported option. This seems
to have gotten lost during some code rearchitecture. Also, rename from
redhat to rhel to match the references in the documentation.

Closes-bug: #1625229

Change-Id: If950b20717205dd0e336e6171971e25a9d07df13
2016-09-19 11:18:16 -04:00
Jenkins
d694b57648 Merge "Remove the unnecessary space" 2016-09-19 15:16:20 +00:00
Jenkins
310180db04 Merge "Optimized the serial upgrade and reconfigure" 2016-09-19 15:16:13 +00:00
Jeffrey Zhang
d9c29c1d66 Install cinder related package for glance
This is needed by glance cinder storage[0].

[0] https://github.com/openstack/glance_store/blob/master/glance_store/_drivers/cinder.py

Change-Id: I6645239acb3fb300afde8cc5260c8935c387d06f
Closes-Bug: #1625226
2016-09-19 23:05:11 +08:00
Jenkins
fc97971f40 Merge "fix config file permission to ironic instead of root" 2016-09-19 14:36:14 +00:00
Jenkins
265a3cbfea Merge "Fix ironic Dockerfile" 2016-09-19 14:24:21 +00:00
Jenkins
33bdf93453 Merge "Enable CADF events in Keystone and introduce enable_cadf_notifications" 2016-09-19 14:23:14 +00:00
Jeffrey Zhang
a05a50e217 Install extra packages for gnocchi using setuptools extra feature
Change-Id: Id702e5e79958a764d827703e996927b161fb379e
Closes-Bug: #1625212
2016-09-19 22:20:16 +08:00
Jenkins
ebcd7b2979 Merge "Remove duplicate lbaas provider config" 2016-09-19 13:48:18 +00:00
Jenkins
bf9e95f317 Merge "Delete extra spaces in gnocchi config.yml" 2016-09-19 12:52:02 +00:00
liyingjun
1b04a23d95 Remove duplicate lbaas provider config
Option `service_provider` is defined in neutron_lbaas.conf, there
is a duplicated config option in neutron.conf, it should be removed
there. Otherwise neutron-server will not be able to start with error:
'Invalid: Driver
neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver is
not unique across providers'

Change-Id: I3fc379535eb00bbcb23aa41de95ca8161883a181
Closes-bug: #1625174
2016-09-19 12:50:14 +00:00
Jenkins
bcb87dd997 Merge "Add "---" into ceilometer/tasks" 2016-09-19 12:46:50 +00:00
Christian Berendt
1908825f92 Document that new services have to be listed in the README file
TrivialFix

Change-Id: I53b7ab6253325b5f7b043afdd6a0dc2df306d3dd
2016-09-19 14:46:24 +02:00
Jenkins
09e7c2d7df Merge "corrected error in multinode.rst" 2016-09-19 12:09:24 +00:00
caowei
fec6382d2d Fix ironic Dockerfile
1.Change "ironic_base" to "ironic_inspector" in ironic-inspector Dockerfile
2.add {% block footer %}{% endblock %}
TrivialFix

Closes-Bug: #1625131
Change-Id: Ibd02676e91a9b00cb1a46e7d00eaa3ab2c6c6412
2016-09-19 19:10:51 +08:00
MD NADEEM
4e9d5b9234 Added Barbican in the list of services deployed by kolla
TrivialFix

Change-Id: Ia51d53e8c7c1c4ece7bb57dc4c68c962aa7257cc
2016-09-19 16:18:44 +05:30
MD NADEEM
aa5f743a8c Added enable_option for some services
TrivialFix

Change-Id: I0f881ea50378bea491bf9721359edc6b5428c28a
2016-09-19 16:06:14 +05:30
caowei
8d2af5f05c Delete extra spaces in gnocchi config.yml
TrivialFix

Change-Id: Ie7bd9b104bd6ce542a365e949941e22eb2c85695
2016-09-19 18:22:36 +08:00