767 Commits

Author SHA1 Message Date
Jenkins
b8da1faf4f Merge "Cinder reads non-Kolla generated config files" 2015-08-24 12:32:33 +00:00
Jenkins
d3d7777ebb Merge "automaton renamed to python-automaton" 2015-08-24 12:31:49 +00:00
Jenkins
11ad3b9917 Merge "Ubuntu - Neutron" 2015-08-24 08:32:58 +00:00
Steven Dake
3327fa4fe2 Cinder reads non-Kolla generated config files
The RDO packages do something wierd about reading files from
/usr/share/cinder/cinder-dist.conf by default.  These files contain
non-Kolla configured configuration values.  This is obviously not
ideal since RDO policies may be different then Kolla policies.

This should probably be fixed across the source base, but for the
moment it is blocking correct operation of Cinder.

Change-Id: I823a90b28eaaf5474334885a45f22ed28537b24b
Closes-Bug: #1487799
2015-08-22 20:00:36 -07:00
Steven Dake
5c5a3faaa0 automaton renamed to python-automaton
Cinder is broken by this RDO package rename.  Maintaining docker templates
for basic things like this until the /docker directory is removed.

Change-Id: Ieae2ab3296346767c305d21e8bb8de964160f84a
Closes-Bug: #1487762
2015-08-22 12:57:47 -07:00
Sam Yaple
7ca1e19e06 Ubuntu - Neutron
Make the changes needed to support Ubuntu

Additionally, adjust the way supervisor is installed. Rather than
installing via pip, install via a package.

Change-Id: I1e7f538a180e4e35166d5afa8ba3f165b7e9f6d5
Partially-Implements: blueprint install-from-ubuntu
Closes-Bug: #1487715
2015-08-22 15:15:35 +00:00
Jenkins
f70e8d4598 Merge "Add Ansible role for memcached" 2015-08-22 01:42:47 +00:00
Paul Bourke
d13163ab51 Add Ansible role for memcached
Note, this is not in the inventories/site.yml as it will be a
transparent dependency of Swift.

Change-Id: Ic8c80072596594e646ece74ac0ce74c7000398ff
Partitially-Implements: blueprint ansible-swift
2015-08-21 13:52:06 +00:00
Sam Yaple
8f7ff27779 Fix MariaDB for ubuntu
In MariaDB we adjust the dependecies of what we install there as well
adding only what is appropriate for the install.

In Ansible we adjust some templates to all work around differences
between the different Linux families.

Change-Id: Ibc26e2f4d4a732630632d3ed27fb595b6fe019d2
Partially-Implements: blueprint install-from-ubuntu
2015-08-21 13:10:05 +00:00
Jenkins
9ddd415486 Merge "Add build from source and templating for Zaqar" 2015-08-21 09:11:40 +00:00
Duane DeCapite
129f1d06a1 Workaround for existing keepalived.pid file
Fixes issue where keepalived will not restart after container failure.
Removes keepalived.pid file if one exists on container startup.

Change-Id: I6ec3297a5e49a4d5255323aa7f75dfdc10d0c5ec
Closes-Bug: #1485079
2015-08-20 19:55:55 -04:00
Swapnil Kulkarni
19136fd4c4 Add build from source and templating for Zaqar
Co-Authored-By: Steven Dake <stdake@cisco.com>

Change-Id: Ibe8b6ea7941ab3f2fd7dcfcd2ed18fd6111bb270
Partially-implements: blueprint install-from-source
Partially-implements: blueprint dockerfile-template
2015-08-20 03:22:33 -07:00
William Frischemeier
c4611eca8e Load ip_vs module for keepalived
If ip_vs is not loaded keepalived will enter a restart loop.  To fix that
load ip_vs module every time we start the container.

Change-Id: I6b39d8654cc6a6da7a9162e5c3efab073746b246
Closes-Bug: #1486276
2015-08-19 17:45:16 -04:00
Jenkins
ddec57673b Merge "Remove barbican" 2015-08-19 16:01:28 +00:00
Jenkins
b214523d58 Merge "Add Dockerfile template for kolla-ansible" 2015-08-19 16:01:02 +00:00
Jenkins
d04ee6b68c Merge "Add oslo_versionedobjects dependency for neutron" 2015-08-19 14:59:23 +00:00
Jenkins
5801e969e1 Merge "Fix keystone for Ubuntu" 2015-08-23 07:42:15 +00:00
Sam Yaple
17333aed12 Fix keystone for Ubuntu
Due to the differences between Ubuntu and Centos around Apache2 I have
had to copy both start.sh and config-external.sh to be unique files
for Ubuntu so as not to affect Centos either. This can be removed when
we change the way config-external works.

Change-Id: I14dc11e7bb6284b897259a53acc914ae8f254d3c
Partially-Implements: blueprint install-from-ubuntu
2015-08-23 06:07:04 +00:00
Sam Yaple
3fe9b78216 Ubuntu - Keepalived
Change-Id: I7e96da95eb8720e3cad0776743cab3d523674f0f
Partially-Implements: blueprint install-from-ubuntu
2015-08-22 14:50:51 +00:00
Ryan Hallisey
eaf096b261 Libvirt is moving around the wrong config file
Libvirt uses libvirtd.conf not libvirt.conf. Currently,
the config file get copied to '/etc/libvirt/libvirt.conf' and
libvirt creates its own libvirtd.conf and ignores the
configured libvirt.

Change-Id: I7a55b92c33ade72b7ac8ba028c67313479ad8343
Co-Authored-By: Ian Main <imain@redhat.com>
Closes-Bug: #1486100
2015-08-19 07:24:25 -04:00
Sam Yaple
102c8332bd Remove barbican
Barbican has never worked properly

Change-Id: Ifd0b74adf5afea321508376ad46ac3ddef0b5b89
Closes-Bug: #1486249
2015-08-19 10:42:34 +00:00
Sam Yaple
7f029b759c Add Dockerfile template for kolla-ansible
Change-Id: I53113d2a7595177839daebe74fa5bc409573f824
Partially-Implements: blueprint dockerfile-template
2015-08-19 05:19:29 +00:00
Steven Dake
bd5e5bbb64 Use one data container for all data volumes
The previous method of using the API image for a data container
worked, but resulted in more data being bindmounted and copied
into the system.  This patch resolves that by essentially using
a distro-type as a FROM in a Dockerfile to generate
distro-type-data.  Further all of the data containers used
throughout ansible are modified to use this new data container.

Change-Id: I8846573d4f2d4b98d4f46c770bfefc6d4c5cd0b5
Partially-Implements: blueprint one-data-container
2015-08-18 20:52:27 -07:00
Steven Dake
22655a19c9 Add oslo_versionedobjects dependency for neutron
RDO doesn't keep their RPM dependencies up to date with latest
neutron changes to requirements.txt, so we have to pip install
the package.

Change-Id: Ic49a4dd3b85e9daf60c87b245b9784818fcb3bb2
Closes-Bug: #1486241
2015-08-18 14:35:33 -07:00
rthallisey
3c5165687a Cinder bootstrap container is not initializing the DB
When running cinder-ansible, the cinder db is never being initialized.
The bootstrap task needs to be fixed in order for cinder to run the db sync.

Change-Id: I01c5f5c34773ffc4e4f7fc7088a7277115db94dc
Closes-Bug: #1485745
2015-08-18 09:35:23 -04:00
Vladislav Belogrudov
91bbe85c5f nova-compute daemon misses libvirt python package on start
source based nova-compute needs libvirt to operate and fails
on start if the corresponding python package is missing.

Change-Id: Ic11bb46f8d067ce63013808ccc3efd17e67a5b83
Closes-Bug: #1485654
2015-08-18 09:09:40 +00:00
xiabing.yao
b11321cedc update config-external.sh in galera,keystone,rabbitmq,swift
Use variables like SOURCE,TARGET in config-external.sh, so
it will easy to modify in future.

Closes-Bug: #1485710

Change-Id: I3880a2cbca8a80d36e84a797fcfb943e43b88bd5
2015-08-06 22:27:28 +08:00
Swapnil Kulkarni
20deecda98 Update Fedora magnum images to use fedora repo
Change-Id: I9f061c028fa9ab1bfdfdb50a1f2d1578fcbaff68
Closes-Bug: #1484777
2015-08-17 22:02:09 +00:00
Steven Dake
bca0595ff8 Neutron base does not need python-neutron-client package
There is no such package.  It is called python-neutronclient.

Since we know deployments work well without this dependency,
might as well just remove the error since it pops up in the
gating.

Change-Id: Ic0daf85201cf283ee0560a9905e5079e421efbc4
Partially-Implements: blueprint gate-source-builds
2015-08-17 10:06:08 -07:00
Steven Dake
91026e78bf Make gnocchi-base build from source
gnocchi-base requires the gcc c++ compiler to build panda, whatever
that is.

Change-Id: Icb4519cf4881390f6958324eb14fb0009fca336e
Paritally-Implements: blueprint gate-source-builds
2015-08-17 10:06:08 -07:00
Ryan Hallisey
726a80cd1d Refactor where source builds place config files
Many of the services have a nested directory that will
be copied into /etc, which will place the config files one
layer too deep. For example: heat has 'heat/etc/heat/heat.conf'.
Copying 'heat/etc*' to '/etc/heat' will create this extra layer.

Change-Id: Iad4661f0316523c5fe8d029d24a8e4fc68da6e15
Closes-Bug: #1484974
2015-08-14 10:58:09 -04:00
Jenkins
3a1c41a21d Merge "Murano install from source incorrectly places config" 2015-08-14 09:03:15 +00:00
Jenkins
e6a28b8f19 Merge "Gnocchi install from source incorrectly places config" 2015-08-14 09:03:08 +00:00
Jenkins
092f3ded94 Merge "Magnum install from source incorrectly places config" 2015-08-14 09:03:05 +00:00
Jenkins
f5084d9668 Merge "Barbican install from source incorrectly places config" 2015-08-14 09:00:51 +00:00
Jenkins
171c6f978e Merge "Ceilometer install from source incorrectly places config" 2015-08-14 08:59:19 +00:00
Jenkins
512d64a978 Merge "Cinder install from source incorrectly places config" 2015-08-14 08:58:44 +00:00
Jenkins
98654a313e Merge "Designate install from source incorrectly places config" 2015-08-14 08:57:15 +00:00
Jenkins
303c389b05 Merge "Fix heat configuration." 2015-08-14 08:55:46 +00:00
rthallisey
759cc41647 All the Cinder services need to reference the correct config
Every service except cinder-api was looking for the file
'/opt/kolla/cinder/cinder-<service>.conf' when the config file in place was named
'cinder.conf'.  Change the rest of the services to look for cinder.conf or
the config file will never be copied over to into '/etc/cinder/'.

Change-Id: I1cd59f1da09e6f3bc7e7b3a4f45f9da2b8247479
Closes-Bug: #1481928
Closes-Bug: #1484248
2015-08-13 16:26:35 -04:00
Ryan Hallisey
b3cdfa18c0 Murano install from source incorrectly places config
The murano base Dockerfile is placing murano.conf in
/etc/murano/murano/murano.conf. It should be in
/etc/murano/murano.conf.

Change-Id: Ia7f5d2f5cc6ca344c0f8f44058a4a4bf34a22546
Co-Authored-By: Ian Main <imain@redhat.com>
Closes-Bug: #1484679
2015-08-13 16:21:13 -04:00
Jenkins
af5dff93ca Merge "Implement Murano source images" 2015-08-13 20:19:36 +00:00
Ryan Hallisey
0c92cc1b3f Magnum install from source incorrectly places config
The magnum base Dockerfile is placing magnum.conf in
/etc/magnum/magnum/magnum.conf. It should be in
/etc/magnum/magnum.conf.  We need to still cp everything
in that directory because there is more than just the config.

Change-Id: I7aa85f465fbd29a882c6628970cade732c818d8f
Co-Authored-By: Ian Main <imain@redhat.com>
Closes-Bug: #1484675
2015-08-13 16:16:37 -04:00
Ryan Hallisey
bf488da70c Gnocchi install from source incorrectly places config
The gnocchi base Dockerfile is placing gnocchi.conf in
/etc/gnocchi/gnocchi/gnocchi.conf. It should be in
/etc/gnocchi/gnocchi.conf.

Change-Id: Idf9af828ac7d8a16138a309b72a3e82903decf79
Co-Authored-By: Ian Main <imain@redhat.com>
Closes-Bug: #1484673
2015-08-13 16:01:40 -04:00
Ryan Hallisey
b2f7d488fc Designate install from source incorrectly places config
The designate base Dockerfile is placing designate.conf in
/etc/designate/designate/designate.conf. It should be in
/etc/designate/designate.conf.

Change-Id: I4892de1eb3365fca5567c492fff8f7ad080075f1
Co-Authored-By: Ian Main <imain@redhat.com>
Closes-Bug: #1484672
2015-08-13 15:58:48 -04:00
Jenkins
77e08a1f5f Merge "Cinder-backup's config-external is missing #!/bin/bash" 2015-08-13 19:55:45 +00:00
Ryan Hallisey
82187c2568 Ceilometer install from source incorrectly places config
The ceilometer base Dockerfile is placing ceilometer.conf in
/etc/ceilometer/ceilometer/ceilometer.conf. It should be in
/etc/ceilometer/ceilometer.conf.

Change-Id: I1c5529b8ac4f93e14d002185f95ed55ab555b50d
Co-Authored-By: Ian Main <imain@redhat.com>
Closes-Bug: #1484669
2015-08-13 15:55:43 -04:00
Ryan Hallisey
24d7c2bed9 Barbican install from source incorrectly places config
The barbican base Dockerfile is placing barbican.conf in
/etc/barbican/barbican/barbican.conf. It should be in
/etc/barbican/barbican.conf.

Change-Id: I4efc040aa0b17da6cfd3bc43a1079ff45ddc3e49
Co-Authored-By: Ian Main <imain@redhat.com>
Closes-Bug: #1484668
2015-08-13 15:52:28 -04:00
Ryan Hallisey
60c589aeb1 Cinder install from source incorrectly places config
The cinder base Dockerfile is placing cinder.conf in
/etc/cinder/cinder/cinder.conf. It should be in /etc/cinder/cinder.conf.

Change-Id: I1d1779ea3fa3ff4e9b7876689121ff9e6da756bd
Co-Authored-By: Ian Main <imain@redhat.com>
Closes-Bug: #1484662
2015-08-13 15:37:38 -04:00
Ian Main
83717e6401 Fix heat configuration.
This was copying the files into /etc/heat/heat (there's a heat/ dir
in etc/ that was copied).  This fixes it.

Closes-Bug: #1484649
Co-Authored-By: Ryan Hallisey <rhallise@redhat.com>
Change-Id: I84b9b38edbf14d176782b8efcce95a41501d758b
2015-08-13 15:13:28 -04:00