737 Commits

Author SHA1 Message Date
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
rthallisey
605d8c9fcd Cinder-backup's config-external is missing #!/bin/bash
Change-Id: I006e7a86683c26e84f0aff731f64cc70a5feedb5
Closes-Bug: #1484510
2015-08-13 08:16:31 -04:00
Sam Yaple
a2e1254a88 Removed config-internal check.sh for cinder
Change-Id: I6c83459f67713842886b24b173f73108596beaa4
Partially-Implements: blueprint remove-config-internal
2015-08-13 10:17:24 +00:00
Jenkins
ff5996d7ad Merge "Cinder-backup is not being configured because config-external spelling error" 2015-08-13 02:37:49 +00:00
Jenkins
a0a859ac92 Merge "Fix missing config in horizon source image" 2015-08-13 02:13:04 +00:00
Jenkins
2ba8628973 Merge "Glance source based containers cannot write to /var/log/glance" 2015-08-12 20:09:24 +00:00
Jenkins
750d3fed20 Merge "Removed config-internal check.sh for glance" 2015-08-12 20:07:36 +00:00
rthallisey
76875c53da Cinder-backup is not being configured because config-external spelling error
In config-external 'OURCE' needs to be 'SOURCE' or the config file will never be copied.

Change-Id: Idad2ff152a8662e5fbafbee6e0328ad7f610320d
Closes-Bug: #1484253
2015-08-12 15:58:16 -04:00
Steven Dake
8ae3b0d67e Rename cinder-app to cinder to be more consistent
Closes-Bug: #1482986
Change-Id: I72619ef18d24038b46d09e77887d6610ef6e8327
2015-08-12 12:04:58 -07:00
Jenkins
af03af45bd Merge "Remove mariadb container" 2015-08-12 16:31:11 +00:00
Jenkins
51575ddf84 Merge "Remove tox -egenconfig since its not needed for cinder" 2015-08-12 16:29:41 +00:00
Vladislav Belogrudov
f30ec59e36 Glance source based containers cannot write to /var/log/glance
Glance services fail when trying to send log messages to
/var/log/glance because the folder has wrong ownership.

Change-Id: Ic3878341e83564278f7eac418bd9ed9be90c929f
Closes-Bug: #1483747
2015-08-11 16:44:51 +03:00
Jenkins
6bca976500 Merge "Glance source based container misses 'glance' user" 2015-08-11 13:19:58 +00:00
Sam Yaple
057d6f2f02 Fix oslo.messaging in neutron-server
oslo.messaging is breaking neutron-server or vice-versa. Either way
pinning oslo.messaging to the current stable fixes the issue. When
2.2.1 is stable or the delorean repos fix the issue we can remove the
pinning

Change-Id: I353aba463d0b1e11f4b58e5edd5241a636701172
Closes-Bug: #1483667
2015-08-11 12:09:48 +00:00
Vladislav Belogrudov
acd3e618e0 Glance source based container misses 'glance' user
This will lead to failed database initialization

Change-Id: If54e928bfe7004b7048294100cebbf693cebda79
Closes-Bug: #1483659
2015-08-11 14:19:27 +03:00
Paul Bourke
328be709fd Fix missing config in horizon source image
Horizon depends on quite a bit of config being in place, most of which a
simple pip install doesn't setup for us.

Closes-Bug: #1481667

Change-Id: I326458d211c16688c00eb04af4bb70978ea3c048
2015-08-10 16:01:01 +00:00
Paul Bourke
a6454f15f2 Implement Murano source images
* Both api and engine start up without error, but can't test properly
until Horizon is fixed (bug #1482196)

* These are source installs are there no RPMs available for Murano
that I can find.

* Also requires a plugin for horizon that will be made as a
separate commit

Co-Authored-By: Mick Thompson <michael.a.thompson@oracle.com>
Implements: blueprint enable-murano-container

Change-Id: Ia46985b21bb5f6d7690501e7199800c8c7fcb51f
2015-08-10 15:52:21 +00:00
Steven Dake
40b56b086d Remove tox -egenconfig since its not needed for cinder
This operation fails to build.  We don't need a default config file
because config-external copies one in.

Change-Id: I9e47c7413189b1d921891c7654a6909249a84bb5
Partially-Implements: blueprint install-from-source
2015-08-10 08:02:02 -07:00
Jenkins
88b6f97cd0 Merge "Remove config-internal for glance" 2015-08-10 12:44:26 +00:00
Jenkins
3877eeeeaf Merge "Remove most kolla-common.sh code" 2015-08-10 12:44:23 +00:00
Jenkins
3b985b2c56 Merge "Remove config-internal from neutron agent start files" 2015-08-10 12:44:16 +00:00
Jenkins
a2eef1e54c Merge "Remove config-internal from cinder-backup" 2015-08-10 12:44:13 +00:00
Jenkins
65f3be33f0 Merge "Clean up comment in rabbitmq" 2015-08-10 12:44:06 +00:00
Jenkins
1dc32f3e99 Merge "Remove config-internal from ceilometer" 2015-08-10 12:44:00 +00:00
Jenkins
9211c5e26d Merge "Remove config-internal from galera" 2015-08-10 12:43:45 +00:00
Jenkins
2f4906acd4 Merge "Removed config-internal check.sh for neutron" 2015-08-10 11:42:06 +00:00
Sam Yaple
7801fd8b19 Removed config-internal check.sh for neutron
Change-Id: Id4e2f081396aaf54030b6f8887e887c8a7b264c3
Partially-Implements: blueprint remove-config-internal
2015-08-10 00:30:45 +00:00
Steven Dake
b132587389 Remove config-internal for glance
Change-Id: If5e100ddf5eda6a484d2eeb4c6adb9ee588d9b92
Partially-Implements: blueprint remove-internal-config
2015-08-09 17:29:58 -07:00
Sam Yaple
591dfb167f Removed config-internal check.sh for glance
Change-Id: Id16dd60c7ee29c953936cbe1b3a77a825af5083f
Partially-Implements: blueprint remove-config-internal
2015-08-10 00:26:11 +00:00
Sam Yaple
a656aedc8e Remove config-internal for Horizon
Change-Id: Iafde0b26008ad93f9a956192da73d59ccb593104
Partially-implements: blueprint remove-config-internal
2015-08-10 00:01:48 +00:00
Steven Dake
32c2f8e107 Remove most kolla-common.sh code
kolla-common.sh is mostly to handle CONFIG_INTERNAL.  Since
CONFIG_INTERNAL has been removed from the repository, we no longer
need most of this code except for set_configs.

Change-Id: I6bcec08c5275f6cd2c61c980ff238b734443e908
Partially-Implements: blueprint remove-config-internal
2015-08-09 16:04:40 -07:00