4465 Commits

Author SHA1 Message Date
Jenkins
8c2ecf005a Merge "Customizations for iscsid" 2016-08-05 08:38:22 +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
67e77035b8 Merge "Customizations for keepalived" 2016-08-05 05:54:30 +00:00
Jenkins
34a4692299 Merge "Customizations for ceilometer" 2016-08-05 03:39:17 +00: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
cf3c917f2c Merge "Updated from global requirements" 2016-08-05 03:24:01 +00:00
Jenkins
790b9a83da Merge "Customizations for mongodb" 2016-08-05 03:23:52 +00:00
Jenkins
05f381df6a Merge "Enable central logging without deploying elasticsearch/kibana" 2016-08-05 03:23:43 +00:00
Matthew Montgomery
c5ce1aa2f4 Customizations for keepalived
This patchset contains Dockerfile customizations for
the keepalived container

Change-Id: I522d2908d3a30178be0c2f22e661b421c5321ffe
Partially-implements: blueprint third-party-plugin-support
2016-08-04 22:15:46 -05:00
Jenkins
88289563b5 Merge "Add customizations for keystone" 2016-08-05 02:50:32 +00:00
Naren Narendra
edcb218a19 Add customizations for keystone
Adds customizations for keystone.

Change-Id: I970e690539388e05f974f92b1e20710cc8de37ed
Partially-Implements: blueprint third-party-plugin-support
2016-08-04 19:56:12 -04:00
Rohit Agarwalla
e418a04e35 Customizations for iscsid
This patchset contains customization of Dockerfile of iscsid
container

Change-Id: Ibca1b944d3eacf03c945eb808f43326c3ef20c97
Partially-implements: blueprint third-party-plugin-support
2016-08-04 10:36:11 -07: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
OpenStack Proposal Bot
dee6f4f10c Updated from global requirements
Change-Id: I492ce6c1add8001f5efdef2c6cd99299807b4755
2016-08-04 02:36:01 +00:00
Jenkins
f4a9667767 Merge "Implement customizations for heat-api-cfn container" 2016-08-03 21:18:16 +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
Jenkins
ec4e8092d9 Merge "Glance interface address, memcached override, and glance override." 2016-08-03 13:59:12 +00:00
Jenkins
3e3240b97b Merge "Horizon interface address and memcached override" 2016-08-03 13:58:40 +00:00
Jenkins
0e8fc03328 Merge "Fix interface address for memcached atop kubernetes" 2016-08-03 13:57:44 +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
Jenkins
f0987383f6 Merge "Using sys.exit(main()) instead of main()" 2016-08-03 03:49:15 +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
Lu lei
684b483fa8 Using sys.exit(main()) instead of main()
As we known, Exceptions are raised by the sys.exit() function. When they
are not handled, no stack traceback is printed in the Python interpreter.

In this patch we have known main() got return values(eg:0, 1), but
it can't specifies exit status when terminate the main thread by
unusing sys.exit(). So when using sys.exit(main()) instead of main()
may be more readable and reasonable.
TrivialFix.

Change-Id: I184289d28b92a7e345907247c045535a0c42c974
2016-08-02 09:32:28 +08:00
Jenkins
6d6cf1dc4c Merge "Add empty upgrade.yml file to ceilometer role" 2016-08-01 12:59:02 +00:00
Jenkins
8c30943688 Merge "Add "Programming Language :: Python :: 3" to setup config file" 2016-08-01 12:49:42 +00:00
Jenkins
4dfed6a07c Merge "Fix undefined error for cinder template" 2016-08-01 12:15:26 +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
Christian Berendt
18fb1b2412 Add "Programming Language :: Python :: 3" to setup config file
TrivialFix

Change-Id: Ifd7a60d4cf25e7ec628ad6913803539b8edc83e8
2016-08-01 01:48:40 +02:00
Mathias Ewald
e5ca547f37 Added telegraf container
Extended base container to include influxdb repositories

Added telegraf container with package from influxdb repo

Change-Id: I6ccf952d7b42eabe8ff7bdbd6471e395db86aa02
Partially-Implements: Blueprint performance-monitoring
2016-07-29 13:19:40 +00:00
Jenkins
74ea96bacf Merge "Clean up Glance image after sanity check" 2016-07-29 12:17:04 +00:00
Jenkins
1ae2b3c904 Merge "Use /etc file to overwrite the docker.service file" 2016-07-29 12:07:46 +00:00
Jenkins
d1f61dfa04 Merge "Enable kolla k8s to override bind api bind address in genconfig" 2016-07-29 11:59:01 +00:00
Jeffrey Zhang
08985a0d79 Use /etc file to overwrite the docker.service file
Docker engine is updated to 1.12. The docker.service in the rpm is
change. Use the /etc/systemd/system/docker.service.d/kolla.conf file to
overwrite the default parameters

TrivialFix

Change-Id: Ice56808f4a1ce1ee57bf5e48c779d033ea6c759c
2016-07-29 17:30:10 +08:00
Jenkins
6ffab8e65f Merge "Fixing crond crashing with centos/source" 2016-07-28 20:52:31 +00: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
Asha Saravanamohan
b1ba77ba91 Customizations for mongodb
This patchset contains customization of Dockerfile of mongodb container

Change-Id: Id2ca174dd81ced733fb119aa8efbefb387d04bb5
Partially-implements: blueprint third-party-plugin-support
2016-07-28 08:46:48 -07:00
Jenkins
be77c38cfb Merge "Make kolla-build list-dependencies option work" 2016-07-28 15:34:57 +00:00