191 Commits

Author SHA1 Message Date
Jenkins
cec609f225 Merge "Fix cinder-api ubuntu binary deploy" 2017-06-05 11:18:17 +00:00
Jenkins
dd11b3f5a4 Merge "Support OSprofile usage" 2017-06-05 08:54:43 +00:00
Jenkins
1832260d32 Merge "Mixing binary and source images for C* projects" 2017-06-05 02:10:03 +00:00
Jenkins
3a68aee3ad Merge "Use auth vars for admin user" 2017-06-04 15:05:29 +00:00
Eduardo Gonzalez
ab4b1ff785 Support OSprofile usage
OSprofile allows user/devs trace OpenStack requests.

Implements: blueprint enable-osprofiler
Co-Authored-By: Bertrand Lallau <bertrand.lallau@gmail.com>
Change-Id: I82ea85d726011ef6cbf99380f395452d6d7f8053
2017-06-02 22:41:33 +02:00
Dai Dang Van
d463b05cfa Mixing binary and source images for C* projects
In case Kolla's users want to deploy with both of
binary and source image, we should have a variable
install type that define install type for each project.

We also add specific image tag for each Openstack project.

This commit is implemented for Ceilometer, Ceph
Cinder, Cloudkitty and Congress projects.

Change-Id: I560ab84545db2e034abe03613c4e7cb407e64ab2
Implements: blueprint mixing-binary-and-source-image
2017-06-02 17:16:14 +07:00
Jenkins
f1b7366e78 Merge "Add copy ceph keyring files conditions in cinder" 2017-05-23 11:23:15 +00:00
Bertrand Lallau
afdd11b9a2 Generalize api_interface_address variable usage
Useful api_interface_address variable has been define here:
https://github.com/openstack/kolla-ansible/blob/master/ansible/group_vars/all.yml#L57
In order to simplify codebase we must use it as much as possible.

Change-Id: I18fec19bf69e05a22a4142a9cd1165eccd022455
2017-05-23 08:35:15 +00:00
Jeffrey Zhang
e5ee448ea8 Mount cinder volume for cinder-volume and cinder-backup all the time
cinder-volume will convert the disk locally when boot image from volume
with create new volume. whereas the container only have 10G space in
default, cinder-volume will complain that no space if image is large.

This patch mount cinder volume for cinder-volume and cinder-backup all
the time.

Change-Id: I8c68ea49374dc67839699b81e345cfc390a01fe3
Close-Bug: #1692485
2017-05-22 18:21:02 +08:00
Eduardo Gonzalez
e9bde0dcb9 Use auth vars for admin user
In someplace in the code admin user, project and domain name
are hardcoded.

This change use the correct variable defined at:
https://github.com/openstack/kolla-ansible/blob/master/ansible/group_vars/all.yml#L278

Change-Id: I3a4c78d81733bf7a2f3c67d259ec5c5f5bb38d3f
2017-05-16 08:54:37 +00:00
Eduardo Gonzalez
ba78082e0c Fix cinder-api ubuntu binary deploy
This changes moves cinder-api to make use of apache to
launch its processes.
Ubuntu binary removed support in Ocata for cinder-api
system services [1]. At this moment cinder in Ocata branch
is not working at all due this issue.

This changes aims to fix cinder in master only for ubuntu
binary with the purpose of make a clean backport to stable/ocata
without do any other change on the backport process.
A follow up change will migrate other OS/install_type to make use
of Apache but only changing master branch.

[1] http://lists.openstack.org/pipermail/openstack-dev/2017-January/111069.html

Change-Id: I9885d6acadbac1da46844f583e7cd37785505ae0
Closes-Bug: #1676751
2017-05-12 12:00:21 +01:00
Jenkins
b077f6e7bb Merge "Add timeout parameter for precheck tasks" 2017-05-07 15:04:24 +00:00
Vladislav Belogrudov
97a5b1ecc3 Fix iSCSI mounts for Cinder backup container
Cinder backup requires iSCSI volume and host mount for backing
any iSCSI volume, not only from LVM backend. 'enable_iscsid' is
a catch-all setting for all iSCSI backends that also runs
necessary iSCSI client on the same host.

Change-Id: Ic486a9f72820df2e0a48a18166f043e5ddb5bd0a
Closes-Bug: #1688519
2017-05-05 13:48:27 +03:00
Jeffrey Zhang
b1f015616c Add timeout parameter for precheck tasks
wait_for module waits 300 seconds for the port started or stopped.  This
is meaningless and useless in precheck. This patch change timeout to 1
seconds.

Change-Id: I9b251ec4ba17ce446655917e8ef5e152ef947298
Closes-Bug: #1688152
2017-05-04 09:02:25 +08:00
shaofeng_cheng
3a67e5727b Add copy ceph keyring files conditions in cinder
If used external ceph for cinder,the ceph storage not enable cephx.
So ceph keyring file not does not exist.
Task throw warning of copy over ceph keyring files.

Change-Id: Ibb3cd536c982ad9dede3c2a0ecfc02cdf6e4c1b9
Closes-Bug: #1684461
2017-04-21 09:58:50 +08:00
Jeffrey Zhang
13e5942a57 Mount /lib/modules folder for cinder-volume container
When using cinder lvm backend storage driver, lvcreate will load dm_*
linux modules when need. So /lib/modules is needed by cinder_volume
container.

Change-Id: I80985794d6aaa6b4ddc71680a97e0d07085dafa7
Closes-Bug: #1684378
2017-04-20 14:00:12 +08:00
Jenkins
1f4d70851a Merge "Allow different configuration of iSCSI helper" 2017-04-19 15:14:15 +00:00
Vladislav Belogrudov
8263dafeb0 Allow different configuration of iSCSI helper
Currently Cinder configuration hard-codes tgtadm as the only
iSCSI management utility. tgtd and tgtadm are older tools to
manage iSCSI volumes. Newer versions of Linux distros use
targetcli and kernel based iSCSI facilities (LIO) and can be
a preferred way for some users.

Change-Id: I10c0a7d596994a9201218e58ca2ad184774a8ce2
Closes-Bug: #1684139
2017-04-19 17:33:51 +03:00
Vladislav Belogrudov
a7c47a0539 Allow use of any backup backend for any volume backend
Currently if Ceph is used for Cinder volumes the only choice of
backup driver is Ceph. It should be possible to use any backup
driver for any volume type, e.g. iSCSI volumes can go to Ceph
based backup storage.

Change-Id: Ifc8a767b9030391580de6a24383bb6b87053835d
Closes-Bug: #1683715
2017-04-18 13:15:02 +03:00
Pavel Glushchak
98f3283dc9 Remove unused driver attr in cinder_backends map
Change-Id: Ib684e3f4bcd26e40c5bfde9bec8a1d83563d5460
Signed-off-by: Pavel Glushchak <pglushchak@virtuozzo.com>
2017-04-04 14:09:24 +03:00
Jeffrey Zhang
29a4b19961 Enable timeout feature when connecting ceph in cinder
cinder-volume will be hanged if rados_connect_timeout is disabled. And
no error message will be thrown. Disable timeout is not a good idea.

This patch sets the rados_connect_timeout to 5.

Change-Id: I05e7343d09d75399a7031013b4329a2cb81792fb
Closes-Bug: #1676267
2017-03-27 14:24:49 +08:00
Jenkins
ef7c6e964d Merge "Delete the deprecated option from the group "DEFAULT"" 2017-03-24 13:29:30 +00:00
Jenkins
7fc5ca29b2 Merge "Register Cinder v3 endpoint in keystone" 2017-03-21 07:53:50 +00:00
Jenkins
a6da4d98a4 Merge "Use kolla_internal_vip_address for glance_api servers" 2017-03-20 13:06:46 +00:00
caoyuan
23c85b4937 Delete the deprecated option from the group "DEFAULT"
more infomation, see http://paste.openstack.org/show/603369/

Change-Id: If803071bfa88b8e5275b3291c05dc3a9f6e08222
Closes-Bug: #1674215
2017-03-20 05:25:10 +00:00
Jeffrey Zhang
9866f8b4b7 Register Cinder v3 endpoint in keystone
Change-Id: I2658259d88a8df1c0d716ed6f360f9514fb957b5
Closes-Bug: #1673703
2017-03-17 18:40:12 +08:00
caoyuan
59228789f4 Remove the deprecated option for cinder.conf
Option "enable_v1_api" from group "DEFAULT" is deprecated.
This patch remove it.

Change-Id: I234e5f417ca310b60ca5e4990223f9d13f583894
2017-03-12 18:46:12 +08:00
Jenkins
a6da1bda59 Merge "Fix booting from volume failure" 2017-03-08 15:28:27 +00:00
Jeffrey Zhang
d06efcecc5 Fix booting from volume failure
Booting from volume require cinder's ceph client secret now. Move cinder
before nova in site.yml, because nova depends on cinder ceph client key
now.

Change-Id: I01c9ed80843d98305b8963894c4917c21a35d3ac
Closes-Bug: #1670676
2017-03-08 21:16:06 +08:00
Jeffrey Zhang
47762d4850 Fix the failure when running precheck after deploy
* Move the tasks to the role
* Skip the task when container is already running

Change-Id: I1990d4dd2a02efa2b3766329000aa23419e0ff17
Closes-Bug: #1670286
2017-03-07 06:57:16 +00:00
Jenkins
d9740e9c40 Merge "Remove unnecessary until in register.yml file" 2017-02-22 12:28:06 +00:00
Jenkins
bb52076329 Merge "Add Loading nfs_shares file without .j2 extension in cinder config" 2017-02-21 16:02:06 +00:00
Jeffrey Zhang
5355155783 Fix copying over nfs_shares task failure
Change-Id: I2e050d811a26ac83f2336d25b02952a9e9835142
Closes-Bug: #1662625
2017-02-08 16:26:56 +08:00
Mauricio Lima
4957752286 Fix parameter issue in cinder handlers
Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Change-Id: I92c0757af6567cbb4ff338493df9931ebef3366c
2017-02-04 15:55:29 +08:00
Jeffrey Zhang
38ad05a872 Remove unnecessary until in register.yml file
Change-Id: I1577cc3afef4dadd3a188c8ba749c9cdfad313ae
2017-02-04 14:38:54 +08:00
Jeffrey Zhang
71f6d104d8 Add Loading nfs_shares file without .j2 extension in cinder config
We do not use *.j2 filename pattern in custom config folder. Add
nfs_shares without .j2 extension for consistency. And do not remove the
.j2 extension file for back compatibility.

Change-Id: Ic66c2f3188e818b9dff4d693102f0d433d2695ac
2017-02-04 13:16:26 +08:00
Eduardo Gonzalez
4e0fa6a334 Remove hardcoded usernames in register.yml
Usernames can be configured with variables in
configuration files, but user creation is hardcoded.

Change-Id: I057cfb921d776217db66f59226dcfa79f3eb7368
Closes-Bug: #1661587
2017-02-03 12:17:54 +00:00
Eduardo Gonzalez
485ded5ba3 Fix pull syntax error in cinder
Change-Id: I548cb6cbc718864cffb95b73376a3e138eef0a6d
Closes-Bug: #1660961
2017-02-01 14:31:52 +00:00
Jenkins
cb4cef062e Merge "Optimize reconfigure action for cinder" 2017-01-27 17:30:43 +00:00
Jenkins
8884422f3d Merge "Refactor register.yml files" 2017-01-26 18:48:59 +00:00
Jeffrey Zhang
8155d74d8d Refactor register.yml files
Co-Authored-By: Mauricio Lima <mauriciolimab@gmail.com>
Change-Id: I9a4a6b6523dee4b388513386b7d85d421f2b7b89
2017-01-26 17:10:27 +00:00
caoyuan
60d24417df Optimize reconfigure action for cinder
Co-Authored-By: Mauricio Lima <mauriciolimab@gmail.com>
Change-Id: I8718c4a63f1d645f3e947f8ce90d196f9cbfd91a
Partially-implements: blueprint better-reconfigure
2017-01-25 09:18:36 -03:00
Jenkins
1da30ce395 Merge "Allow cinder-volume to be configured to use HNAS nfs" 2017-01-24 13:08:38 +00:00
Mauricio Lima
8b93e9d69d Allow cinder-volume to be configured to use HNAS nfs
Change-Id: I5910da875eba9f9b9a18d27fcb69bb38ad67bad0
2017-01-18 11:06:45 -03:00
Jenkins
3f8cb8adda Merge "Refactor bootstrap.yml file" 2017-01-18 10:17:50 +00:00
Jenkins
016d79f009 Merge "Render ceph.conf using merge_configs" 2017-01-17 16:40:04 +00:00
jackning
b25c6b15fe Render ceph.conf using merge_configs
At present, cinder/nova/glance/gnocchi relative containers's
ceph.conf aren't be merge from user custom's config.
In some condition, we should add extra parameter to custom's
ceph.conf, for example:rbd_default_features = 1.

So, it is necessary to use merge_configs instead of template.
Closes-Bug: #1656162

Change-Id: I824e0c68af270b85c52382ae35987213266fc6f6
2017-01-17 09:32:44 +08:00
Jeffrey Zhang
7233b45d29 Refactor bootstrap.yml file
Change-Id: I00d2dcb0895548ba169ab85764cf546c2214cbf5
2017-01-12 23:37:50 +08:00
Eduardo Gonzalez
a18174b3b4 Unify jinja syntax
Change-Id: I63197f8c5646e44a9a7287e644c904a1e227af23
2017-01-12 10:52:44 +00:00
Tino Schmeier
dde279cbec cinder.conf either supports lvm or ceph backend, not both
Cinder can be configured to support either
lvm or ceph backend. Using both backends only enables lvm
as the ceph backend configuration is combined
with the lvm backend part via elif code.

Change-Id: I57e515cf7cdd6377d60bfbc45a889553ce87207a
Closes-Bug: #1654996
2017-01-09 14:20:38 +01:00