132 Commits

Author SHA1 Message Date
caoyuan
6853e7e382 Fix the group check for glance-registry
TrivialFix

Change-Id: I5f279008aae6f7630abaa30b6b3d725ff5003764
2017-01-18 21:23:44 +08:00
Jenkins
3f8cb8adda Merge "Refactor bootstrap.yml file" 2017-01-18 10:17:50 +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
Michal (inc0) Jastrzebski
34ce7aad5a Limit check containers to reconfigure action
Genconfig doesn't require running containers or even docker installed.
This caused issues in kolla-k8s gates. Let's limit this task to
reconfigure.

Change-Id: I41265ea8d255aca59d73c1582486ed1e7885a829
2017-01-05 00:14:35 -05:00
Jeffrey Zhang
d37da2cfa9 Optimize reconfigure action for glance
Partically-implements: blueprint better-reconfigure
Change-Id: I89e30e8b87f24a621c521d915842a4af0042d6fe
2017-01-02 10:58:43 +08:00
Eduardo Gonzalez
775d8019b6 Add custom policies in service.json
Include custom policy.json files in service-api.json.j2 files

Change-Id: Ic55bfc6f61131aa72c3497ce8b2282056bcc7f92
Partially-Implements: blueprint custom-policies
2016-12-02 16:22:17 +00:00
Jenkins
0d234fe910 Merge "Fix placement of policy.json" 2016-12-01 09:37:10 +00:00
Jenkins
f17731b632 Merge "Move glance precheck into its own role" 2016-11-29 16:26:16 +00:00
Duong Ha-Quang
b5d1e4b457 Fix placement of policy.json
Currently, policy.json is put in
"{{ node_config_directory }}/{{ service_name }}"
in target nodes.

Relocation policy.json to "{{ node_config_directory }}/{{ item }}"
with item is corresponding service compoment config directory.

Currently, the policy.json is copied to all services, but it
should be reviewed and left only in neccesary service
(at many cases, only API service needs that).

Redundant files will be removed in follow up patchset.

Change-Id: I0e997dccf4ec438c9c0436db71ec2fd06650f50d
Closes-Bug: #1639686
2016-11-29 16:00:09 +07:00
Jeffrey Zhang
eb4313ca49 Move glance precheck into its own role
Depends-On: I0773851b61d341117ab214382856a9036aca51bb
Change-Id: I060e21ada928577e833de2782be5ea570be32730
Partially-implements: blueprint condition-pre-check
2016-11-29 09:56:45 +08:00
liyingjun
0af48d30a1 Notification needed for searchlight
Needs to enable notifications for services when enabling searchlight
[1][2][3][4]

[1]
http://docs.openstack.org/developer/searchlight/plugins/cinder.html#cinder-conf
[2]
http://docs.openstack.org/developer/searchlight/plugins/glance.html#glance-configuration
[3]
http://docs.openstack.org/developer/searchlight/plugins/neutron.html#neutron-configuration
[4]
http://docs.openstack.org/developer/searchlight/plugins/nova.html#nova-configuration

Change-Id: Id2167d901ac3d65599e54feb1b2d1818d2a633c9
Closes-bug: #1643393
2016-11-21 10:12:55 +08:00
Jenkins
dbc881456b Merge "Custom policy files" 2016-11-04 13:42:55 +00:00
Jeffrey Zhang
fa45801946 Move precheck into its own role
* Merge prechecks.yml and site.yml playbook
* Create empty precheck.yml into all roles.

Change-Id: I8a138558a26c0a2a66c5fd48ed37be657c99c1dd
Implements: blueprint condition-pre-check
2016-11-03 14:48:58 +08:00
Eduardo Gonzalez
ef1fd6b8c0 Custom policy files
Allow operators to use their custom policy files.
Avoid maintain policy files in kolla repos, only copying
the files when an operator add their custom config.

Implements: blueprint custom-policies
Change-Id: Icf3c961b87cbc7a1f1dd2ffbfffcf271d151d862
2016-10-28 10:47:05 +01:00
Jenkins
61993554f9 Merge "Remove unnecessary blank line from file glance-api.json.j2" 2016-10-24 11:07:52 +00:00
Jeffrey Zhang
3e89f987c0 Add validate no new line at end of file
TrivialFix

Change-Id: I817aa52caf56b7d54b266e553db6db1ceb38b773
Signed-off-by: Jeffrey Zhang <zhang.lei.fly@gmail.com>
2016-10-19 17:17:06 +00:00
Chris Hoge
70643a5237 Add http as allowed store when glance configured to use rbd
Adds http as an allowed store when glance is configured to use
ceph/rbd as the image store. The default configuration for
glance with lvm uses http as a secondary store. http store
is commonly used with automation tools like heat to pull
images into glance from endpoints. Without specifying http
as a store the expected default behavior fails. This patch
restores that default behavior.

Change-Id: Id3663123b8d54e53bd1fd130b65fd8383c9f35c0
Closes-Bug: #1631637
2016-10-18 21:48:36 -07:00
caoyuan
4c24dd6a2d Remove unnecessary blank line from file glance-api.json.j2
TrivialFix

Change-Id: I87c255079734d9967891715795077f0fefee9d4b
2016-10-19 00:53:39 +00:00
Jeffrey Zhang
2828fe8c6b Fix glance upgrade permission issue
Change-Id: I8316310c13017b86eb13c3ffad260fecb0e7f61b
Partial-Bug: #1631503
2016-10-14 22:33:53 +08:00
Jeffrey Zhang
fa856556d5 Remove do_reconfigure.yml file for all roles
do_reconfigure.yml is introduced to use serial directive. But we use
it in wrong. Now serial has moved to playbook file. So it is time to
remove the do_reconfigure.yml file

Closes-Bug: #1628152
Change-Id: I8d42d27e6bc302a0e575b0353956eaef9b2ca9fd
2016-09-27 15:04:00 +00:00
caoyuan
a071bce07b Add "---" into some files of yaml
TrivialFix

Change-Id: Id2cd736f136068514f26977b434b15a8b1ffc8be
2016-09-21 11:52:20 +00:00
Mick Thompson
4c1482b999 Added serial option to site.yml.
Useful for upgrade etc., which is preferablly done serially.

Example usage: tools/kolla-ansible deploy OR tools/kolla-ansible upgrade

Closes-Bug: #1576708

DocImpact

Change-Id: I34b2e16f8ce53e472a4682a4738c4ac0f5abf00c
2016-09-13 09:26:51 +00:00
Serguei Bezverkhi
134089d6cd Adding required check for Orchestration Kubernetes
Thgis PS add missing check for Kubernetes orchestration engine,
without these changes, running kolla-ansible genconfig fails
for Kubernetes environment.

TrivialFix

Change-Id: I25eeb7ae3ddba7c924f6d48aa24afdbe74227170
2016-09-12 15:32:42 -04:00
Jeffrey Zhang
d255743601
Move to transport_url for rabbitmq configuration
rabbit_hosts, rabbit_userid and rabbit_password are deprecated for
removal.[0]

rpc_backend is deprecated for removal.[1]

rabbit_ha_queues is deprecated. it is useless when using RabbitMQ >= 3.0
[2]

[0] https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/_drivers/impl_rabbit.py#L112,#L134
[1] https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/transport.py#L46
[2] https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/_drivers/impl_rabbit.py#L163,L174

Closes-Bug: #1614082
Change-Id: I05d318ba6c11c5dbfa9fbf67d088a43ab465be30
2016-08-25 16:07:42 +08:00
Jenkins
54c745fc36 Merge "Port with_ loop variable syntax to Ansbile 2" 2016-08-10 06:44:00 +00:00
Duong Ha-Quang
34975e291e Port with_ loop variable syntax to Ansbile 2
Migrate to full variable syntax in with_ loop
instead of bare variables for:
- ceph
- ceilometer
- glance
- heat
- horizon
- keystone
- mariadb
- memcached
- neutron
- nova
- rabbitmq

Change-Id: Ib925b4ecea47ac758a77739c9c7e140f06933b08
Partial-Implements: blueprint ansible2
2016-08-09 23:23:21 +07:00
Christian Berendt
823cb33aec Remove unused project_yaml parameter from role metadata files
TrivialFix

Change-Id: I7ff752fffe47e9571ea15acdad3edd4835f9e612
2016-08-07 22:18:17 +02:00
Ken Wronkiewicz
85db94e5b7 Glance interface address, memcached override, and glance override.
Note: This should not result in any behavior changes in regular Kolla, just
Kolla-Kubernetes and only when you've overridden stuff in globals.yml

Allows override of interface address, memcached pools, and glance registry
host so that Kubernetes can do the right thing.

There are some significant architectural issues involved in memcached pooling
in the Kolla-kubernetes world.  Avoiding them right now.

Current working with this Kolla-Kubernetes globals.yml file:

api_interface_address: "0.0.0.0"

memcached_servers: "memcached"

keystone_database_address: "mariadb"
keystone_admin_url: "http://keystone-admin:35357/v3"
keystone_internal_url: "http://keystone-public:5000/v3"
keystone_public_url: "http://keystone-public:5000/v3"
glance_registry_host: "glance-registry"

Two tings to note:
 * This depends on a kolla-kubernetes patch, so that it won't be merged
   until it's safe for glance to bind to 0.0.0.0.  It's OK to bind to
   0.0.0.0 in the Kubernetes world because the network fabric controls
   access.
 * In Kolla-Kubernetes, the global.yml file doesn't do var substitution
   so you have to be explicit about the URLs, otherwise Keystone will
   look like it was provisioned but it won't quite be provisioned right.

Co-Authored-By: Ryan Hallisey <rhallise@redhat.com>
Change-Id: Ic87566118a1d4f552748392ff394b9b121c91887
Partially-implements: blueprint api-interface-bind-address-override
Depends-On: I586ce1c6c3300254c4e2a398ff46645df576aeb0
2016-08-02 12:39:26 -04:00
Jenkins
9aa0acb65b Merge "Consistent external Ceph configuration for Glance" 2016-07-27 19:28:13 +00:00
Jeffrey Zhang
3c3b0288b4 Use a lower number of the workers
Use a lower number of workers rather than the default value, which is
equal to the number of the cpu. Otherwise, in a multi cpu environment,
the number of the processes will very high.

In this PS, we use min(5, << number of cpu >>) as the default worker
count.

Closes-Bug: #1582254
Change-Id: I1c32cf0db794b43b8fb8be18f39190422ca5846f
2016-07-27 16:36:25 +08:00
Mathias Ewald
a66f0076ea Consistent external Ceph configuration for Glance
Made glance follow the <service>_backend_ceph configuration pattern.

Change-Id: I7bc2b3b35d96bd297d520750dccd7333fa68d941
Closes-Bug: #1605962
2016-07-24 07:04:05 +00:00
Jenkins
da61508db8 Merge "Fix the failure to create instance snapshot" 2016-07-20 02:54:40 +00:00
Jeffrey Zhang
101856b863 Fix the failure to create instance snapshot
When making snapshot for instance with ceph enabled, nova will use
upate image api to create the snapshot directly. with the patchset
I7284dee828bc8ca00747bc7668b37fa7176afc85 in Glance, the
show_multiple_locations must be True.

Change-Id: Ic9612566e2ab8f641030fef97b519f11d942a915
Closes-Bug: #1604464
2016-07-19 23:16:36 +08:00
Bartłomiej Daca
e61f13d880 Fix 'reconfigure' command of kolla
Changed the order of the 'when' statements in "remove/restart
containers" tasks. It will fix the reconfiguration problem when
deploying different components on different hosts.

Change-Id: Ibee9dd56b6128b664144deb1d9eb7ec32e39fd5c
Closes-Bug: #1603943
2016-07-18 13:51:11 +02:00
Mathias Ewald
f16a45180c External Ceph support - Implementation Glance
Most simple implementation of external ceph support.

We use INI merge to configure RBD backend for Glance and copy
ceph.conf and keyring provided by the user into the container.

Set_configs.py had to be extended to support globbing (wildcards) in
order to copy ceph keyring file which is named depending on the cephx
user name.

Partially-Implements Blueprint: external-ceph
Partially-Implements Blueprint: selectable-ceph

Change-Id: Iacadbd8ec9956e9f075206ea03b28f044cb6ffb8
2016-07-14 14:05:34 +00:00
Dave Walker (Daviey)
2a2a86ac43 glance-*, fix rabbit config with ceilometer
Currently, if ceilometer is enabled with glance then the
rabbitmq is non-functional, causing various glance failures
including image upload.

This is caused because:
The generated config fails to have a carriage return at the
end of the rabbit_host line, causing the following line to
be added to this entry.

rabbit_host is used rather than rabbit_hosts, where the
fromer expects a string, rather than the list that is
provided.

This also adds rabbit HA support, to be in-line with the
other services using rabbitmq.

This is resolved, by pushing the rabbit_hosts entry to be
last, meaning that a carriage return is not required.

Change-Id: I89f26d542565b98025fd9b84fc4beb5cbed364e5
Closes-Bug: 1596244
Signed-off-by: Dave Walker (Daviey) <email@daviey.com>
2016-06-26 01:17:34 +01:00
Hui Kang
4108c6c6ec Implement ceilometer ansible role
Change-Id: I13c50a78b2dc7c98b720a4b2e7161104213bd295
Implements: bp ansible-ceilometer
2016-06-16 22:05:56 -04:00
Christian Berendt
c37d1d25bc Load the metadata definitions during Glance bootstrap
Change-Id: I4e6ecbcfbd11a516b1ddc2fe7a62f20b8313ae07
Closes-bug: #1584698
2016-06-13 20:36:57 +02:00
Jenkins
6f17a71d7f Merge "add support for non-default database_port in kolla/ansible" 2016-05-26 09:24:56 +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
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
Jenkins
1011b7cd24 Merge "map the host localtime to the container" 2016-05-03 19:12:15 +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
Ryan Hallisey
67333e4dd1 Set db connection retry to infinity
Make sure that all the sevices will attempt to
connect to the database an infinite about of times.
If the database ever disappears for some reason we
want the services to try and reconnect more than just
10 times.

Closes-bug: #1505636
Change-Id: I77abbf72ce5bfd68faa451bb9a72bd2544963f4b
2016-04-11 07:22:09 -04:00
Jeffrey Zhang
0a6cff4a6d Refactor the glance service group mapping
Add a glance_service_groups variable containers the container name,
service name and group name. In this way, we can remove lots of
duplicated lines.

TrivialFix

Change-Id: I9beb7509ad7221cd495e3211a2e67d986486aac6
2016-03-28 12:25:48 +08:00
Jeffrey Zhang
9523fd0e56 Only copy the necessary config files for Glance
Only copy the necessary config files when it _really_ needed. This
will make the config file safer

Partial-Bug: #1559122
Change-Id: I5f5df54c688fb4f6b0ee68815116e2418d5742f7
2016-03-28 12:24:23 +08:00
SamYaple
d4535b6dc3 Add memcached_servers to keystone_auth section
The in-process cache for keystone tokens has been deprecated due to
"incosistent results and high memory usage" with the expectation we
switch to memcached_servers if we want to stay performant.

Add memcache_servers [cache] section to the appropriate servers as the
[DEFAULT]\memcache_servers options was deprecated.

TrivialFix
Related-Id: Ied2b88c8cefe5655a88d0c2f334de04e588fa75a

Change-Id: Ic971bdddc0be3338b15924f7cc0f97d4a3ad2440
2016-03-19 21:53:03 +00:00
SamYaple
1f371e2717 Allow per node configuration with augments
This type of per node configuration is required to support things like
availability zones for nova. As always, if this file doesnt exist it
doesnt get used so this change is safe.

TrivialFix

Change-Id: Iff8172af522c2c96e5f2c173b24a5dfd4d522ed2
2016-03-17 17:18:00 +00:00