1132 Commits

Author SHA1 Message Date
Robin Naundorf
a7c41a8893 Fix inconsistencies in git url
Github is just a mirror of the OpenStack git-repo.
Changed from Github to OpenStack git url wherever possible.

Change-Id: I7941ef86967de4efe7f23ff9fb11ec86c793901e
2016-08-06 14:21:23 +02:00
Jenkins
306bc101d1 Merge "Add Watcher default settings" 2016-08-05 18:36:11 +00:00
Dave Walker (Daviey)
bb2397d26d Add Watcher default settings
This adds:
  - AIO and multinode inventory samples
  - Password (blank) fields for default password.yml
  - Default to not enabled, in globals.yml

This is the last changeset in the series to add basic
Watcher functionality to Kolla.

Change-Id: I9daec0eadc8dad3d37e03e7d69783af003af0916
Closes-bug: #1598929
Partially-implements: blueprint watcher
Signed-off-by: Dave Walker (Daviey) <email@daviey.com>
2016-08-05 09:17:28 +00:00
Jenkins
a0707a52d5 Merge "Fix the evaluating conditional for enable es and kibana" 2016-08-05 08:13:17 +00:00
Jenkins
aa1830eb0a Merge "Correct mistral-executor image name" 2016-08-05 07:25:38 +00:00
Jeffrey Zhang
59b887dfb5 Fix the evaluating conditional for enable es and kibana
Fix the wrong if condition for enable_elasticsearch and
enable_kibana

TrivialFix

Change-Id: I3d649d39b9eafb4526d8919f1cb962f6378815c7
2016-08-05 14:31:28 +08:00
Jenkins
b52edd573b Merge "Fix the kolla_docker issue with docker 1.12" 2016-08-05 03:34:28 +00:00
Jenkins
086cc02e90 Merge "Cleanup images as part of kolla-ansible cleanup" 2016-08-05 03:34:19 +00:00
Jenkins
1db534e4d0 Merge "Change workers to be static when using kubernates" 2016-08-05 03:24:09 +00:00
Jenkins
05f381df6a Merge "Enable central logging without deploying elasticsearch/kibana" 2016-08-05 03:23:43 +00:00
Jenkins
6350b99fad Merge "Volume specification for ironic-api was invalid." 2016-08-04 16:44:11 +00:00
Will Rouesnel
391b069180 Volume specification for ironic-api was invalid.
This prevented deploying ironic-api using kolla.

Changing to a single entry list fixes the problem and allows the deploy to
succeed.

Closes-Bug: #1606702

Change-Id: I98c2b06ab08e3b8afcaeb712be377cb363220283
2016-08-05 00:00:14 +10:00
MD NADEEM
76aeb503c8 Correct mistral-executor image name
TrivialFix

Change-Id: I24838b3487baa97d8a03bbde2ecdfb42c29ebb80
2016-08-04 03:54:38 +00:00
Christian Berendt
4cd95dbcc5 Enable central logging without deploying elasticsearch/kibana
This changed introduces 4 new parameters to be able to use an existing
elasticsearch service for central logging.

* elasticsearch_address - address of elasticsearch server
* elasticsearch_protocol - protocol (HTTP/HTTPS) used by elasticsearch server
* enable_elasticsearch - deploy elasticsearch container
* enable_kibana - deploy kibana container

Closes-bug: #1584861

Change-Id: Ia1ff9ae8b6d9929c3826da02693d1e2fc9ea2522
2016-08-03 21:59:51 +02:00
Jenkins
63d448fe2e Merge "External Ceph - Implementation Nova" 2016-08-03 15:29:36 +00:00
Paul Bourke
810b7e460b Cleanup images as part of kolla-ansible cleanup
TrivialFix

Change-Id: I88004f08c75e7d648a615e64d59ccf655b6a1a13
2016-08-03 09:58:24 +00:00
Takeaki Matsumoto
046f739d1b Change workers to be static when using kubernates
When orchestration engine is Kubernates,
ansible_processor_vcpus is not defined.

This patch changes workers to be static when using kubernates

Change-Id: I4d77b2e48ea24c4ca8b86ec5b7e6029c054b247a
Closes-Bug: #1609206
2016-08-03 02:47:59 +00: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
Ken Wronkiewicz
a6d89f44e9 Horizon interface address and memcached 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 and memcached pools, 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"

Three tings to note:
 * In Kolla-Kubernetes, the service is not using net=host, so a
   0.0.0.0 interface address is totally OK.  That patch has been merged.
 * 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.
 * In order to not duplicate tons of code, moved the keystone_admin_url /
   keystone_internal_url / keystone_public_url to the common defaults
   from the keystone defaults.

Co-Authored-By: Ryan Hallisey <rhallise@redhat.com>
Change-Id: I586ce1c6c3300254c4e2a398ff46645df576aeb0
Partially-implements: blueprint api-interface-bind-address-override
2016-08-02 12:39:22 -04:00
Ken Wronkiewicz
492411f267 Fix interface address for memcached atop kubernetes
Change-Id: I0fdbef7c5a2bfc13e01c26d8107c7ad03881b520
Partially-implements: blueprint api-interface-bind-address-override
Depends-On: Ia0e4951c327be01b717aebb86ef4c3a4e7ed170e
2016-08-02 12:39:15 -04:00
Jenkins
5ce4de6b2b Merge "Change config for lbaas service_plugins" 2016-08-02 12:41:50 +00:00
Jenkins
6d6cf1dc4c Merge "Add empty upgrade.yml file to ceilometer role" 2016-08-01 12:59:02 +00:00
Jeffrey Zhang
ae34973d35 Fix the kolla_docker issue with docker 1.12
After docker 1.12, the RepoTags will be None rather than [] in the
image list API. This PS will handle the both case.

Change-Id: Ie2da44b44229c2f190550755b50876f607f9cc0c
Closes-Bug: #1608358
2016-08-01 13:41:05 +08:00
liyingjun
fc97ff1021 Change config for lbaas service_plugins
Lbaasv2 is used by default, we should change service_plugins for lbaas
from 'lbaas' to
'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2'
as suggested in networking-guide:
http://docs.openstack.org/mitaka/networking-guide/adv-config-lbaas.html#configuring-lbaas-v2-with-an-agent

Change-Id: I49a24500403bd2717fcad49742830c6ceaaf210b
Closes-bug: #1608344
2016-08-01 11:48:01 +08:00
liyingjun
ae3d381de7 Fix undefined error for cinder template
openstack_service_worker should be openstack_service_workers

Change-Id: Id4fb54bc1d4363cfa056851d1a32ee56411e7ba8
Closes-bug: #1607482
2016-08-01 10:01:53 +08:00
Michal (inc0) Jastrzebski
5838bd0b3c Enable kolla k8s to override bind api bind address in genconfig
It's good if k8s reuses ansible templates, but we need to abstract all
ansible specific variables to achieve that.

- Implements ansible override variable api_interface_address.
- Adds api_interface_address setting and comments to globals.yml
- Makes changes to mariadb templates to accept this new setting.
- Disabled Galera when api_interface_address==0.0.0.0 in the
  case of Kubernetes.  Otherwise, mariadb fails to start.
- Tested with and without setting to ensure kolla genconfig output
  does not change when setting is disabled or undefined.

Change-Id: Ia0e4951c327be01b717aebb86ef4c3a4e7ed170e
Partially-implements: blueprint api-interface-bind-address-override
Co-authored-by: David Wang <dcwangmit01@gmail.com>
Co-authored-by: Ryan Hallisey <rhallise@redhat.com>
Co-authored-by: Kevin Fox <kevin@efox.cc>
2016-07-28 11:59:28 -04:00
Jenkins
c895034030 Merge "Use lbaas alias instead of the class name" 2016-07-28 11:38:27 +00:00
Mathias Ewald
ffafebf87c External Ceph - Implementation Nova
Introduced nova backend selection flag for Ceph and priority if
multiple backends are configured

Add mechanism to deploy arbitrary ceph.conf and keyring files into
nova-compute and nova-libvirt containers

Added documentation

Change-Id: Id010ca9cc2d914e5358ef79edeb600a28220dd4b
Implements: blueprint external-ceph
2016-07-27 20:25:00 +00: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
Jenkins
02b2280323 Merge "Use the node_custom_config variable in the config.yml file" 2016-07-27 02:29:50 +00:00
Jenkins
4f3c213cbf Merge "Python 3: dict.iteritems()" 2016-07-26 17:49:28 +00:00
Jeffrey Zhang
5fe1676f72 Use the node_custom_config variable in the config.yml file
Fixed the ceilometer and neutron lbaas agent.

TrivialFix

Change-Id: Ie06826eb358e1a6487f96a978d8f191d79a0e054
2016-07-27 00:22:27 +08:00
Jenkins
27e7f4bc5d Merge "Allow custom configurations for ceilometer" 2016-07-26 16:02:25 +00:00
qinchunhua
1bddef94cb Python 3: dict.iteritems()
Replace dict.iteritems() with dict.items(). The Python 3 dict
type has no iteritems() method, the old iteritems() method was
renamed to items().

TrivialFix.

Change-Id: I2137e72554fd16d2c70e50306e4f57d27e35bcd3
2016-07-26 12:42:07 +00:00
Jenkins
b2d69946c7 Merge "Pull tgtd image when need" 2016-07-25 12:01:36 +00:00
Jeffrey Zhang
618d5d20cc Pull tgtd image when need
TrivialFix

Change-Id: Ib9812d5c4f26f87bba1f42d809caf6c9233aa8f2
2016-07-25 09:48:44 +08:00
Christian Berendt
2730005c47 Add empty upgrade.yml file to ceilometer role
TrivialFix

Change-Id: Iab9cb7e188f441a0583464df64d006d1fb75ba43
2016-07-24 20:56:54 +02: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
Christian Berendt
1a549d0cc3 Allow custom configurations for ceilometer
TrivialFix

Change-Id: I47f3ca22a814b6dbe3761cff6c63c60df8bc55d0
2016-07-23 01:29:43 +02:00
Dave Walker (Daviey)
c3a6aa684a Add Watcher ansible roles and templates
Previous work on Watcher added the Docker images, this
change adds the ansible configuration.

There is support for HA, via haproxy to balance across the
Watcher API hosts.

There is also a hook into nova.conf to conditionally add
Nova compute Host metrics via Ceilometer if Watcher is enabled.

This defaults to enabled false.

Change-Id: I8763528bb6ff12943b810212c71396d2d7cf6836
Partial-bug: #1598929
Partially-implements: bp watcher
Signed-off-by: Dave Walker (Daviey) <email@daviey.com>
2016-07-22 11:45:19 +01:00
Jenkins
d79ca609c5 Merge "implement Ansible Tempest role" 2016-07-22 09:34:08 +00:00
Jeffrey Zhang
ba42fb6836 Use lbaas alias instead of the class name
Plugin alias is recommended to use.

TrivialFix

Change-Id: I2b8cb9a8e70e6310000bf6b9ad731f85cbf9e04b
2016-07-22 12:10:32 +08:00
Jenkins
4196603f85 Merge "Bind the ceilometer-api process to the api_interface only" 2016-07-22 03:02:47 +00:00
Jenkins
d944418458 Merge "Added ceilometer decision in neutron.conf for event notifications" 2016-07-22 03:00:47 +00:00
Jeffrey Zhang
3a51aadda4 Bind the ceilometer-api process to the api_interface only
TrivialFix

Change-Id: If8590b0f053844b8f68e4e2b0a73c1b3c34f23ed
2016-07-21 22:04:00 +08:00
Jenkins
1fd6f79c8a Merge "Configurable policy.json for keystone" 2016-07-21 09:41:03 +00:00
Dennis Mueller
76f0f9ae27 Added ceilometer decision in neutron.conf for event notifications
Changes the oslo_messaging_notifications driver of neutron if
ceilometer is enabled

Change-Id: I16667ceb6fe75aff7f324d342e5075e1b028c70e
Closes-Bug: 1604793
2016-07-20 13:58:42 +02:00
Jenkins
da61508db8 Merge "Fix the failure to create instance snapshot" 2016-07-20 02:54:40 +00:00
Jeffrey Zhang
2102631110 implement Ansible Tempest role
DocImpact

Implments: blueprint ansible-tempest
Change-Id: Iadd86d9d91438f056c433b9a2016f32587c92878
2016-07-20 09:43:10 +08:00