915 Commits

Author SHA1 Message Date
Jenkins
44b5e223f2 Merge "Make oslo.log work properly with syslog" 2015-09-28 20:50:20 +00:00
Steven Dake
f422733a0b Make oslo.log work properly with syslog
The syslog support in oslo.log is broken.  This patch makes oslo.log
work properly by using a backported patch from master.

Change-Id: Idb7b38e3cecbfd6547dad148f22f13a4c8557c8f
Implements: bp logging-container
2015-09-28 13:15:43 -07:00
Jenkins
dab1382909 Merge "Rename ovs to openvswitch" 2015-09-28 13:29:01 +00:00
Jenkins
e69571eeb3 Merge "Convert ceph to json" 2015-09-28 11:26:26 +00:00
Jenkins
edca14421e Merge "Allow conf files to be optional" 2015-09-28 11:22:25 +00:00
Sam Yaple
76920be5fa Rename ovs to openvswitch
Our openvswitch image does not follow the naming convention of any of
our other containers and it should.

Change-Id: If1b815117bb39df74061218e48778479b8d674bc
Closes-Bug: #1500392
2015-09-28 11:10:17 +00:00
Jenkins
a0ac876494 Merge "Heat doesn't need to specify python-oslo-reports" 2015-09-28 11:07:58 +00:00
Jenkins
3b6261a21a Merge "Significant refactor of base image" 2015-09-28 10:54:35 +00:00
Jenkins
6a622ec82c Merge "Implement a install_type and install_metatype" 2015-09-28 10:49:53 +00:00
Sam Yaple
83d195249e Convert ceph to json
Remove ceph debug info and unused partuuid

Change-Id: Ifbe9890979ee666d7e43a04376f36c41ae2d8add
Implements: blueprint ceph-container
Partially-Implements: blueprint replace-config-external
2015-09-28 10:35:52 +00:00
Sam Yaple
7622e53cc1 Allow conf files to be optional
There are situations where we need to copy-if-exists mainly in cluster
setups. This is needed to replace config-external for ceph right now

Change-Id: I3c0898d8c584338a38e6ce4c4146e145910c5a52
Partially-Implements: blueprint replace-config-external
2015-09-28 10:35:52 +00:00
Jenkins
aadbbcbee0 Merge "remove set_configs" 2015-09-28 10:34:58 +00:00
Jenkins
762b24cc1a Merge "Remove quotes from subshell call in bash script" 2015-09-28 10:26:38 +00:00
Steven Dake
473a0229d4 Heat doesn't need to specify python-oslo-reports
This package is correctly specified in the dependencies of the
heat packaging now so removing it from the base package.
Change-Id: I9028f41f5ee95b728c425235846b9825501b6f70
Implements: blueprint rhel-based-image-support
2015-09-28 03:16:52 -07:00
Steven Dake
f74cd0ecb8 Significant refactor of base image
This refactor organizes the code as follows:

If RPM family:
    execute YUM repo setup
    if binary
        install binary tools
    if source
        install source tools

IF DEB family:
   install source tools

I have tested building and everything seems fairly solid except
possilby RHOS.  The long term goal of this patch is to allow us to
add our own repos in the "execute YUM repo setup" section of the base
file based upon OpenStack Infrastructure YUM repos.

Partially-Implements: blueprint rhel-based-image-support
Change-Id: I759fb8fc050973460c9c69bb500de68e88a68b3b
2015-09-28 03:16:52 -07:00
Steven Dake
0e99b69de4 Implement a install_type and install_metatype
This prepares for the RHEL OSP implementation by making the build
tool convert all binary-* into an install_type of binary and * into
an install_metatype variable substitution inside the Dockerfiles.
Further binary-* is substituted as install_name to enable proper
building only.

Change-Id: Ib681b29176eb79a3cab12ec824313fdecb6e7a5f
Partially-Implements: blueprint rhel-based-image-support
2015-09-28 03:16:48 -07:00
Zhao Lei
c62ddbfa97 Remove quotes from subshell call in bash script
Always no quotes for $() statement.

We don't need quotes to hold blanks in result:
 # i=$(echo 1 2 3)
 # echo $i
 1 2 3
 #

These quotes can make something wrong in some case:
 # i=$(echo '!')
 #
 # i="$(echo '!')"
 -bash: !: event not found
 #

No real problem for current code, only to use a better code style.

Change-Id: I06520f4b11ea6b56c4e73049b6f38bfc62fe1392
Closes-Bug: #1499716
Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
2015-09-28 17:50:36 +08:00
Jenkins
5b482b68c2 Merge "Remove all fail sections for Ubuntu" 2015-09-28 09:42:43 +00:00
Jenkins
018d806204 Merge "Replace config-external - rsyslog" 2015-09-28 09:14:31 +00:00
Jenkins
1e55ee77ca Merge "Replace config-external - openvswitch" 2015-09-28 08:54:59 +00:00
Jenkins
cb752f1e57 Merge "Upgrade packages when installing openstack-clients" 2015-09-28 06:20:15 +00:00
Sam Yaple
160f1cc011 remove set_configs
Change-Id: I9bb0a1fac63cc326234b0f06b1e56b43e0753279
Partially-Implements: blueprint replace-config-external
2015-09-27 13:44:50 +00:00
Sam Yaple
f2aea128b3 Replace config-external - rsyslog
Change-Id: Ic19c1a0e975f6097813cad52f880042e33730ff8
Partially-Implements: blueprint replace-config-external
2015-09-27 13:44:50 +00:00
Sam Yaple
94ea43fa55 Replace config-external - openvswitch
Change-Id: Ib05442c6ee146d2deb49fc235ba16fc7e0c3d6c8
Partially-Implements: blueprint replace-config-external
2015-09-27 13:44:50 +00:00
Sam Yaple
39aba34b2a Remove all fail sections for Ubuntu
Ubuntu binary is not supported and may never be. Installing from
cloud-archive packaging is only for the current stable distros, Ubuntu
does not have a Delorean type repo. We place a fail message in the
base image to catch this and remove the messages throughout the
project.

An additional fail message is placed to catch all other things.

Change-Id: Id2953f503ebd42226f6a08e75979ae56511c40f7
Implements: blueprint install-from-ubuntu
2015-09-27 08:10:59 +00:00
Martin André
6360ccab60 Upgrade packages when installing openstack-clients
This resolves the package versions conflicts we saw recently and fixes
source image building gate.

Change-Id: I489499e447ac1b7bb82ae9d69eb5b7fe7bd7591d
Closes-Bug: #1498303
2015-09-26 15:06:29 +09:00
Sam Yaple
99c7eb1997 Make OpenStack use Ceph
This implements all the openstack pieces needed to make ceph work.

DocImpact
Change-Id: I1d24476a966602cf955e5ef872b0efb01319894a
Partially-Implements: blueprint ceph-container
Implements: blueprint kolla-live-migration
2015-09-25 20:11:18 +00:00
Sam Yaple
a1b0518b9a Fix removal of config-external
I removed the files but not the COPY commands thus breaking all of
Kolla

Change-Id: I37d3e0cb94a1ecc12971f485f953310ba8fee53c
Partially-Implements: blueprint replace-config-external
2015-09-25 20:08:40 +00:00
Jenkins
3fb97c4d1e Merge "Remove config-external.sh" 2015-09-25 17:04:45 +00:00
Jenkins
7d6e3eb3aa Merge "Replace config-external - swift" 2015-09-25 17:04:33 +00:00
Jenkins
07506e4d78 Merge "Replace config-external - murano" 2015-09-25 13:51:06 +00:00
Jenkins
b27564bca2 Merge "Replace config-external - memcached" 2015-09-25 13:50:50 +00:00
Jenkins
6cf67a05e1 Merge "Replace config-external - horizon" 2015-09-25 13:50:41 +00:00
Jenkins
00f35e5590 Merge "Replace config-external - haproxy keepalived" 2015-09-25 13:50:16 +00:00
Sam Yaple
e2e0fd288f Remove config-external.sh
Removes config-external for all services that have been replaced in
Ansible

Change-Id: I839a14418638b977fbc1d02ba6839811b0f909ea
Partially-Implements: blueprint replace-config-external
2015-09-25 13:00:55 +00:00
Sam Yaple
3d81353706 Replace config-external - swift
Change-Id: I785cb53d64cbf8dbc0fad97882f9fd0307982e5d
Partially-Implements: blueprint replace-config-external
2015-09-25 12:58:44 +00:00
Jenkins
0f297ed0ee Merge "Ceph Ansible support" 2015-09-25 11:14:56 +00:00
Sam Yaple
0cc328c625 Replace config-external - murano
Change-Id: I8c5fdb2f2d3284960318a8189c4cc5bd6a8e59e9
Partially-Implements: blueprint replace-config-external
2015-09-25 11:06:42 +00:00
Sam Yaple
9b18d2d28b Replace config-external - memcached
Change-Id: I83094d1fc98c79c74d6c9fdc68aa224ae4a6d672
Partially-Implements: blueprint replace-config-external
2015-09-25 11:06:38 +00:00
Sam Yaple
4d5186473e Replace config-external - horizon
Change-Id: I72577ee7dd2dfbd199ca91f6f33f970fe1c9c89f
Partially-Implements: blueprint replace-config-external
2015-09-25 11:06:35 +00:00
Sam Yaple
89ecfc164e Replace config-external - haproxy keepalived
Change-Id: I668c31401305713e720f0f0ae8ec18e320ea1c76
Partially-Implements: blueprint replace-config-external
2015-09-25 11:06:27 +00:00
Jenkins
9c54b0afff Merge "Fix memcached user on Debian/Ubuntu based distro" 2015-09-24 14:01:44 +00:00
Sam Yaple
c86e66c9dc Ceph Ansible support
Add the initial playbooks for making ceph and ansible play nice
together.

This does not include all of the openstack changes to make things like
nova, glance, and cinder work. This will simply build the ceph cluster
and thats it. The next patchset will do the OpenStack integration.

DocImpact
Change-Id: Ie1697dde5f92e833652933a80f0004f31b641330
Partially-Implements: blueprint ceph-container
2015-09-24 12:33:43 +00:00
Michal Jastrzebski (inc0)
943ffd76ed Glance logging to rsyslog
Configure glance to use rsyslog container as logging mechanism

Change-Id: I60f604d7a85bb4309b26be03cd6b8aac14840fe7
Implements: bp logging-container
2015-09-24 12:45:46 +02:00
Ryan Hallisey
6f9709ce9c Replace config-external with a JSON file for Heat
Change-Id: Ie79667ec2f9b091403ead9abc3c0f85afb7944bc
Partially-Implements: blueprint replace-config-external
2015-09-24 08:13:07 +00:00
Ryan Hallisey
57017b0acd Replace config-external with a JSON file for Cinder
Partially-Implements: blueprint replace-config-external

Change-Id: Ic247433290b51c9fb613d90e4a9a0f3d11526b35
2015-09-24 08:12:56 +00:00
Ryan Hallisey
2c23f2d445 Replace config-external with a JSON file for Neutron (thin)
This is only for the Neutron thin containers.  The Neutron agents
are still in a fat container.  I'll replace in another patch.

Change-Id: I8533af52bfa3f268aa8ffb1c16ae49f5a300da27
Partially-Implements: blueprint replace-config-external
2015-09-24 08:12:19 +00:00
rthallisey
aebb16fff9 Replace config-external with a JSON file for Nova
Change-Id: I38c545484a7b1f3906d844eb3a7486e11c4b276a
Partially-Implements: blueprint replace-config-external
2015-09-23 19:33:27 +00:00
Jenkins
9a814e128f Merge "Replace config-external with a JSON file for Glance" 2015-09-23 19:30:45 +00:00
Jenkins
274d808ff9 Merge "Replace config-external with a JSON file for Keystone" 2015-09-23 19:30:34 +00:00