1909 Commits

Author SHA1 Message Date
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
Jenkins
fea0f07c08 Merge "bind haproxy to single interface" 2015-09-28 10:40:07 +00:00
Jenkins
b283066e29 Merge "Stop haproxy from listening on ports it shouldnt" 2015-09-28 10:38:55 +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
Jenkins
1b43c2b352 Merge "Unify commands in documentation" 2015-09-28 10:22:50 +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
Jenkins
57f5905db9 Merge "Bind novnc to single interface" 2015-09-28 10:10:16 +00:00
Jenkins
d813f53b95 Merge "Allow different defaults for different providers" 2015-09-28 09:51:47 +00: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
385658b776 Merge "Fixes inconsistency in ansible inventories" 2015-09-28 09:42:36 +00:00
Jenkins
769493e802 Merge "Create nova-libvirt directory before copying files" 2015-09-28 09:35:25 +00:00
Jenkins
018d806204 Merge "Replace config-external - rsyslog" 2015-09-28 09:14:31 +00:00
Jenkins
fab6518aee Merge "Swift logging to rsyslog" 2015-09-28 09:08:27 +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
7ad9619e02 Unify commands in documentation
The deployer is expected to know the correct permissions for his
environment. Remove 'sudo' everywhere and unify commands

Change-Id: I1ca295221a57e9d8cb35293620d14c0d8c72007d
Closes-Bug: #1496566
2015-09-28 05:47:55 +00:00
Sam Yaple
fc92f91cdb Fixes inconsistency in ansible inventories
These inventories are examples, but the examples are inconsistent.

Change-Id: I3dd834058879221c1a58196350540af9c28f4bf5
Closes-Bug: #1492455
2015-09-28 05:37:31 +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
5e60d8ec87 Create nova-libvirt directory before copying files
The previous patch (I92f2eac895283791b2eea6a4351a43e90fdbb5a3) didn't
fix it because of the ceph patch that merged.

Change-Id: I82207f5cc684f7c180e301cac69fcc98fca63268
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
aa1b2a1c4f Bind novnc to single interface
Change-Id: I163588ed369661bfa493ef3b28fc34c1b3a91b52
Closes-Bug: #1500166
2015-09-27 09:32:57 +00:00
Sam Yaple
ae30857144 bind haproxy to single interface
Change-Id: I0c9d85ec7da98d32b94d1e61538fe20333536d39
Closes-Bug: #1500159
2015-09-27 09:17:51 +00:00
Sam Yaple
9f99d63ea2 Stop haproxy from listening on ports it shouldnt
Haproxy is currently setup to listen on all services, even ones that
aren't being installed (e.g. cinder or swift). This patch places
conditionals around those groups.

Change-Id: Ia1ff873ce075768dfebf442aabf13604076ce637
Closes-Bug: #1500157
2015-09-27 08:46:04 +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
Jenkins
7ef0b8966c Merge "Simplify instructions to install vagrant-libvirt" 2015-09-27 07:42:05 +00:00
Sam Yaple
06be8ce7e0 Ceph bugfix for missing host
Change-Id: I902e771a6e377f9ce3e452c123b2bbf65e3a2d7f
Implements: blueprint ceph-container
2015-09-26 13:21:34 +00:00
Martin André
f49bfe2bc5 Simplify instructions to install vagrant-libvirt
A new version was released and it is not necessary anymore to install
from git.

Change-Id: Id05c4b0c969d32c14e63f1b3e88bc73c8b7ff890
Partially-Implements: blueprint vagrant-improvements
2015-09-26 17:43:37 +09:00
Martin André
7e7ce85f77 Allow different defaults for different providers
Change-Id: I63bf8d4d3c5d359e82f2cac47cfd4ad7ce500ccf
Closes-Bug: #1498454
Closes-Bug: #1498461
Partially-Implements: blueprint vagrant-improvements
2015-09-26 17:38:03 +09: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
e4cc27ff42 Merge "Vagrant bootstrap incorrectly adds quotes to kolla-build.conf" 2015-09-25 18:22:04 +00:00
Jenkins
0e2a627ea8 Merge "Rename swift-readme.rst to swift-guide.rst" 2015-09-25 18:21:11 +00:00
venkatamahesh
b543f2d71b Fix the repository to openstack
Changed the repository of kolla to
openstack

(Note: the bug describes using github, but in the review it was
determined that using openstack repos is best.)

Change-Id: I26c9543776a441ab3ca606ad7aa7381db94fe094
Closes-Bug: #1495162
2015-09-25 13:16:04 -04: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
5b25443d8f Merge "Add chown for /usr/share/kolla in Vagrant setup" 2015-09-25 16:27:32 +00:00
Steven Dake
bdad07d2de Rename swift-readme.rst to swift-guide.rst
All services should have a guide that follows the same style as
cinder-guide.rst or swift-guide.rst and all should be named
service-guie.rst.

Change-Id: Iaa75d137d4e159452153f9fe572fe017fe988be4
2015-09-25 08:54:44 -07:00
Paul Bourke
a97714c07a Vagrant bootstrap incorrectly adds quotes to kolla-build.conf
Change-Id: Icff81e74ab1b1f7d8aed7a2676ac506b062832dd
Closes-Bug: #1499758
2015-09-25 16:43:00 +01:00
Jenkins
80c1726b45 Merge "Add pub key to the VM booted by vagrant" 2015-09-25 15:41:12 +00:00
Paul Bourke
008aaee439 Add chown for /usr/share/kolla in Vagrant setup
Change-Id: Ia67546e4fd2b4b1761f33fa4d8b58b785cf15c29
Closes-Bug: #1498920
2015-09-25 15:34:29 +00:00
Jenkins
d66eaf65e3 Merge "Add missing when statments when copying JSON files in ansible" 2015-09-25 13:53:11 +00:00
Jenkins
07506e4d78 Merge "Replace config-external - murano" 2015-09-25 13:51:06 +00:00