978 Commits

Author SHA1 Message Date
Jeffrey Zhang
3545e6d503 Fix the incompatibility for ansible 2.1.0
Ansible 2.1.0 has lots of change and the plugin is not compatible
between 2.0.0 and 2.1.0. This change fix the gap.

* fix the signature change for _make_tmp_path in ansible 2.1.0
* fix the common_options in the kolla_docker.py

Change-Id: I05f5f05581c8bd625cd868fa0db549d0c60a7043
Closes-Bug: #1586018
2016-05-30 23:02:09 +08:00
Jenkins
6f5239ce40 Merge "Bump the ansible to 2" 2016-05-26 10:57:27 +00:00
Jenkins
6f17a71d7f Merge "add support for non-default database_port in kolla/ansible" 2016-05-26 09:24:56 +00:00
Jenkins
cac8b39795 Merge "Make configurable the location where config files are merged" 2016-05-24 14:44:07 +00:00
Jeffrey Zhang
491822c510 Bump the ansible to 2
DocImpact

Change-Id: I3cdfbf84919de80f535c030bd146787ecda40dec
partial-Implements: blueprint ansible2
2016-05-24 19:53:31 +08:00
Jenkins
f8e15358c5 Merge "Generate configuration using ansible for any project" 2016-05-24 05:21:54 +00:00
Ryan Hallisey
f5e0a3959b Change ansible image to kolla_toolbox
All the images follow the same naming schema where the container
name is part of the ansible variable name.  Currently, the
kolla_toolbox container is named ansible_image_full.  Change
this to match what the container name is.

Could impact operators who are specifying ansible_image_full
in globals.yml.

TrivialFix

Change-Id: I9f0cbe4bd69ce17489310a1f5734a254e6ebe27b
2016-05-23 10:13:48 -04:00
Jenkins
fdca053c35 Merge "Configure the rabbitmq ha policy in config file" 2016-05-23 14:38:29 +00:00
Jenkins
fef79059b7 Merge "Adding variables for Cinder iSCSI backend configuration" 2016-05-23 09:52:48 +00:00
Ryan Hallisey
2da010a7b9 Make configurable the location where config files are merged
An operator may want to specify the location of custom config
files so that kolla can detect their location and merge
them with the default configs generated.

Partially implements: blueprint multi-project-config

Change-Id: Ibfb38d07a36dfa7fe25381adc34cc1d3cbe7d1e1
2016-05-23 03:23:06 -04:00
Ryan Hallisey
c5f686ac43 Generate configuration using ansible for any project
Give outside projects the ability to consume kolla-ansible as a
config generation mechanism by allowing for the developer to define
a directory structure within /etc/kolla that fits a project's needs.

For example, kolla-kubernetes does not define configuration in terms
of serivces, but in terms of pods (groups of services).

Partially implements: blueprint multi-project-config

Change-Id: If08443aefcaf5fa5604b243b39a6a2d54e431cff
2016-05-23 03:15:37 -04:00
Jeffrey Zhang
e7441a4212 Configure the rabbitmq ha policy in config file
Closes-Bug: #1580884
Change-Id: Ief5917d48dbf6abe4a5861e73b24d534b889bd52
2016-05-23 10:27:33 +08:00
Jenkins
5ee2e6a87d Merge "Stop configuring neutron to enforce DHCP MTU option" 2016-05-18 12:26:45 +00:00
Francesco Vollero
a7d330d9e7 Fixed typos in Ansible files
Files affected:
- ansible/roles/ceph/tasks/bootstrap_mons.yml
- ansible/roles/neutron/tasks/deploy.yml
- ansible/roles/neutron/tasks/start.yml

TrivialFix
Change-Id: Ic4b624cfe0ae4d73b49e616319e9db2229931249
2016-05-18 08:33:15 +02:00
Jenkins
3f2a5bdadc Merge "Add a cluster_network interface when we use ceph" 2016-05-17 19:21:57 +00:00
Jenkins
8bf2017bb9 Merge "Make Heka collect Ceph logs" 2016-05-17 19:20:54 +00:00
Ihar Hrachyshka
a627681eec Stop configuring neutron to enforce DHCP MTU option
Since Mitaka, Neutron does the right job to calculate and advertise
correct MTU to instances, out of the box [1].

[1] https://review.openstack.org/#/c/302165/

TrivialFix
Change-Id: I71a6dc5b56c2c1fb9db757df77a56feababdc039
2016-05-17 15:54:49 +00:00
weiyu
b071bb22c9 Add a cluster_network interface when we use ceph
Because of the consideration of security and performance, ceph community
recommend the use of two separate network public networks and cluster
networks. refer:
http://docs.ceph.com/docs/master/rados/configuration/network-config-ref/

DocImpact
Closes-Bug: #1582095
Change-Id: I8cb0e14f86c859820fbbb8af8f94ac8155338e13
2016-05-17 14:09:36 +08:00
Waldemar Znoinski
a2c2eba34f add support for non-default database_port in kolla/ansible
This change makes each step of the kolla deployment aware
of the port database was configured to listen on.
It defaults mariadb_port to database_port.

Change-Id: I8e85d5732015afc0a5481cb33e0b629fdfa84a1b
Closes-Bug: #1576151
DocImpact
2016-05-13 12:12:25 +00:00
Davanum Srinivas
48b4b15828 Avoid _ in rabbitmq_clusterer.config
Trying to use ConfigMap's in Kubernetes leads to an interesting
problem. We use the file name as the key and the contents of the
file as the text value. The ConfigMap is mounted on the container
as a volume and the key is then used as the name of the file. The
problem is that kubernetes has a limitation on the name of the
key

https://github.com/kubernetes/kubernetes/blob/release-1.2/docs/design/identifiers.md

Which means we cannot use '_' in the name of the file.

Closes-Bug: #1581162
Change-Id: I2d9ec80f989c30893b019954fe18b3623d27a076
2016-05-13 07:39:12 -04:00
Serguei Bezverkhi
4150df42e2 Adding variables for Cinder iSCSI backend configuration
This fix adds several variables required for Cinder iSCSI backend
configutation.

Change-Id: I2f709f8589fdbf62e3d0b265452fd58f413bee65
Closes-Bug: #1579800
2016-05-09 11:15:32 -04:00
Mauricio Lima
1a2fe93a95 Make Heka collect Ceph logs
Change-Id: Ibaa5f8ba600afafa111d2ef204ee9192b8babdfc
Closes-Bug: #1570529
2016-05-05 13:26:44 -04:00
Jenkins
233158f754 Merge "Adding ability to specify capabilities and security" 2016-05-04 21:27:04 +00:00
Serguei Bezverkhi
a08a762f30 Adding ability to specify capabilities and security
This patch adds ability to specify required capabilities and security
mode for a specific docker container.

Change-Id: Ib8c15a8e354178bedd31ebb31a64618431f0e135
Closes-Bug: #1572648
2016-05-03 15:24:16 -04:00
Jenkins
1011b7cd24 Merge "map the host localtime to the container" 2016-05-03 19:12:15 +00:00
Jenkins
31d1271f1e Merge "Fix radosgw 'rgw frontends' param" 2016-05-03 10:24:18 +00:00
Jeffrey Zhang
0fcee87549 map the host localtime to the container
Closes-Bug: #1577148
Change-Id: I636cefc63cf532434a41af3898b63dffa711e280
2016-05-03 09:27:51 +08:00
Mauricio Lima
2c34214388 Remove unecessary blank lines
TrivialFix

Change-Id: I1f03d428c380dfdbde5ef33e7ea43cbf5e9154ce
2016-05-02 07:44:29 -04:00
Carlos Cesario
819ae24b50 Fix radosgw 'rgw frontends' param
Fix 'rgw frontends' param on ceph-rgw container.
After apply this patch the service starts
http://paste.openstack.org/show/495786/

Closes-Bug: #1576817
Change-Id: I434ca2a72c035f457bd50ef5de20e62f89974e0c
2016-05-02 08:32:04 -03:00
Jenkins
4075a2382f Merge "Re-order the when condition in the cinder reconfigure" 2016-04-28 20:57:37 +00:00
Jeffrey Zhang
1c85dc1858 Re-order the when condition in the cinder reconfigure
Change-Id: Ib058a0d2bfd442cc80d67ec034b37298e881ae79
Closes-Bug: #1576209
2016-04-28 21:10:51 +08:00
Paul Bourke
d9fc4c6f40 Update murano service name
In Mitaka, the service name must have a dash rather than underscore when using
the sql catalog driver in Keystone[0] (the default).

This works for upgrade also, though further improvements could be written to
remove the old endpoint from Keystone, and automatically chose a dash or
underscore based on driver type used.

[0] http://docs.openstack.org/releasenotes/murano/mitaka.html#upgrade-notes

Change-Id: I15a03370afdad6529eec51a206b6134bf80b283d
Closes-Bug: 1576152
2016-04-28 12:35:16 +01:00
Jenkins
a22b7714e3 Merge "Add a role to cleanup containers after deployment" 2016-04-27 17:21:46 +00:00
Jenkins
279e6b2ed4 Merge "Configures swift-rsyncd to use non-default port" 2016-04-22 04:48:24 +00:00
Serguei Bezverkhi
d553514cb7 Configures swift-rsyncd to use non-default port
This PS configures swift-rsyncd process to use non-default port
from the range above 1024.

Change-Id: I7c37c548a5185a2ffac789383fe012619e401131
Closes-Bug: #1573137
2016-04-21 12:54:30 -04:00
Jenkins
1de1fe8bc9 Merge "Disable tty for keystone register script" 2016-04-21 16:48:29 +00:00
Jenkins
1c266502ea Merge "Fix iscsid & tgtd sections in inventory samples" 2016-04-21 16:12:02 +00:00
Steven Dake
a861450fd2 Fix failure to deploy with qemu.conf
Closes-Bug: #1572819

Change-Id: I1f2edb482af1e85708159a0dba44a79427dc5af3
2016-04-21 03:00:45 -04:00
Jenkins
d636ee6781 Merge "Remove check for config files to verify MountFlags" 2016-04-21 05:43:50 +00:00
Jenkins
c08ec0fe59 Merge "Use proper protocol scheme with nova" 2016-04-20 22:31:39 +00:00
Swapnil Kulkarni (coolsvap)
47894bb05f Remove check for config files to verify MountFlags
Check MountFlags option with systemd rather than with
configuration files which can be overriden with
different ones.

Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Change-Id: Ifa4ce62372af3fe75a66b45c8e7cf9ac9f9c2415
Closes-Bug: #1571281
2016-04-20 10:15:34 +05:30
Jenkins
35e9ef860f Merge "Revert "check /e/s/s/docker.service in ubuntu"" 2016-04-20 04:42:00 +00:00
Steven Dake
3238373ab7 Revert "check /e/s/s/docker.service in ubuntu"
going to merge Swapnil's patch instead of this patch as it relies on real system output rather then looking in files on the filesystem which differ between distributions.

This reverts commit 5c5e903973a9db4541196fbe9fcb99ce66c5cfa4.

Change-Id: I3e474620c90c1f7b2f5e16106f2c18b2058e169c
2016-04-20 03:24:15 +00:00
Paul Bourke
a0ce3608ee Fix iscsid & tgtd sections in inventory samples
* Multinode was missing the relevant sections

* AIO had a typo and incorrect group for iscsid

Co-Authored-By: Serguei Bezverkhi <sbezverk@cisco.com>
Closes-Bug: #1572050
Change-Id: I198d9fe8997a96b77ac5cbc9e354878fb6047861
2016-04-19 17:29:30 +01:00
Paul Bourke
e2452906f3 Disable tty for keystone register script
There seems to be a bug regarding the interaction between the Red Hat
based images and docker exec, where output is missed when attaching a
tty. This can be replicated using the following:

$ docker run -d --name test centos /bin/sleep infinity
$ docker exec -t test echo hi

Repeat the second command over and over, "hi" will only be printed out
every couple of runs.

This affects the keystone register task as sometimes it will not print
it's final json result to stdout, causing ansible to fall over with a
difficult to diagnose error (despite the register having run
successfully).

Disabling the tty fixes this for me, it should not be needed in this
case regardless.

Change-Id: Ie7eb7c01c34ee3c59bd843651195fbcb7259d2c8
Closes-Bug: #1572082
2016-04-19 15:59:51 +01:00
Mauricio Lima
8588bd655e Add a role to cleanup containers after deployment
Change-Id: I5f422574d7e50ec9a1e5862b66ecbf39fe1594d2
Closes-Bug: #1531721
Implements: blueprint ansible-cleanup-role
2016-04-19 10:00:59 -04:00
Jenkins
0d87a2372b Merge "Remove node_templates_directory in ansbile variable file" 2016-04-19 09:47:34 +00:00
Steven Dake
79627310aa Use proper protocol scheme with nova
Change-Id: I699d3fa4db897a25c31384b7dacf1c465aa4ea86
Closes-Bug: #1571129
2016-04-15 22:01:03 -04:00
Jenkins
a4104c2aec Merge "Add TLS to Kibana Web Interface" 2016-04-15 18:48:11 +00:00
Dave McCowan
4c8227ec8b Add TLS to Kibana Web Interface
Use HAProxy to terminate a TLS connection on port 5601 for the
Kibana dashboard when TLS is enabled for Kolla. x-forwarded-for
and x-forwarded-proto headers are set to give Kibana the info it
needs to write returned URLs.

Change-Id: I03a2dd3a8e2513d38281b30bf4bae6449fec0316
Closes-bug: #1566117
2016-04-15 14:06:36 -04:00