6714 Commits

Author SHA1 Message Date
Mark Goddard
dbc5967f73 Support kolla-ansible installed in a virtualenv
Currently it is not possible to use kolla-ansible when it has been
installed in a virtualenv. Virtualenv-based installation may be
desirable when a suitable system package (e.g. RPM, .deb) is not
available, as it allows the user to install kolla-ansible and its
dependencies without affecting the system-wide packages.

This change checks for the presence of the $VIRTUAL_ENV environment
variable to determine whether we are running in an virtualenv. Since
kolla-ansible is not a python script, this comes with the caveat that we
must source the virtualenv activation script ($VIRTUAL_ENV/bin/activate)
before executing kolla-ansible.

Change-Id: I19efb96605bee3b16df3a0b78cd681e5f15499f6
Closes-Bug: #1530319
2017-02-16 15:31:58 +00:00
Jenkins
2825e18fc3 Merge "Fix BASEDIR because of new kolla-ansible project name" 2017-02-16 15:13:14 +00:00
Eduardo Gonzalez
053fb379ec Make service_plugins and extensions more configurable
Ease new service_plugins and extension integration as well
as improve code readiness.

Change-Id: I9924de51a70e9342c9ac56113c9fbd148a58c322
2017-02-16 13:07:35 +00:00
Jenkins
02cfdeeaa4 Merge "Fix extension_drivers check in ml2" 2017-02-16 12:33:36 +00:00
Jenkins
a63c148ec5 Merge "Optimize reconfigure action for trove" 2017-02-16 12:13:38 +00:00
zhuzeyu
b2da75f60c Update production architecture guide for formatting
Change-Id: Ic5a9ec189949c0f6f986f3ff4f48266b7548d8e5
partially-implements: blueprint documentation-rework
2017-02-16 19:57:59 +08:00
Jenkins
8a18a3b72b Merge "Optimize reconfiguration for collectd" 2017-02-16 11:49:40 +00:00
Jenkins
4d00421053 Merge "Optimize reconfigure action for manila" 2017-02-16 11:49:35 +00:00
Jenkins
f671fdf5a0 Merge "Fix haproxy log not writable in upgrade" 2017-02-16 11:49:29 +00:00
Jenkins
527fc00533 Merge "Optimize reconfiguration for designate" 2017-02-16 11:49:22 +00:00
Jenkins
a703348e8f Merge "Fix typo in neutron's default/main.yml file" 2017-02-16 08:56:00 +00:00
Saverio Proto
e2316dd552 Fix BASEDIR because of new kolla-ansible project name
In commit 177fbea79a1babdcd4e8230341380d373eef6df4 the project
was renamed to kolla-ansible, and this broke the BASEDIR
in the kolla-ansible wrapper.

Closes-bug: #1665262

Change-Id: I89fe15e5723f39f453a8173f7ced3f623a8bccc5
2017-02-16 09:18:34 +01:00
Jenkins
c884bbcbbd Merge "Change freezer service type" 2017-02-16 08:09:56 +00:00
Jenkins
16f1b5963c Merge "Fix freezer auth issue" 2017-02-16 08:02:58 +00:00
Eduardo Gonzalez
50232c3b18 Fix extension_drivers check in ml2
Use neutron_extension_drivers to add the option only when
a extension_driver is enabled.

Change-Id: I44a4e8c95c331fff0b66d18c11566211408fbb85
Closes-Bug: #1665258
2017-02-16 07:54:02 +00:00
zhubingbing
87b8dae67e Fix haproxy log not writable in upgrade
Change-Id: Icddd27ef0f5041ace848eec75e732143635c1001
Closes-Bug: #1665005
2017-02-16 07:36:54 +00:00
Jenkins
adfb956729 Merge "Secret generate fail with hostvars is undefined" 2017-02-16 07:14:40 +00:00
t.goto
79b4774e68 Fix typo in neutron's default/main.yml file
There is an unnecessary condition operator in neutron's
defaults/main.yml which causes pull error.

- Delete an duplicated "or" from neutron-sfc-agent host_in_groups
 check condition.

Change-Id: I32626ad83fbca9a17cd89b70ff95d58d23b200d2
Closes-Bug: #1665188
2017-02-16 14:39:54 +09:00
Jenkins
357fb3e87c Merge "Remove support for py34" 2017-02-16 03:29:00 +00:00
caowei
3e3ab11749 Fix freezer auth issue
Change-Id: I14ba906cb688c935351ef296badccf720b0267f0
Closes-Bug: #1665195
2017-02-16 10:27:49 +08:00
Jenkins
55d23e1356 Merge "Fix chrony genconfig" 2017-02-16 02:02:47 +00:00
zhuzeyu
f6af64bd99 Fix typo in all.yml
Change-Id: Ifff1d1840c3e790afbe6993d0a9c6e201d5f0ba4
2017-02-16 09:32:09 +08:00
Chung Chih, Hung
b719782d44 Secret generate fail with hostvars is undefined
When Kolla-kubernetes try to generate secret, it will found one file
named ansible/group_vars/all.yml at kolla reporitory. Then try to render
the file. There is one variable named tunnel_interface_addres which will
access hostvars variable, but this variable is not exist at kubernetes
orchestration engine.

We should add condition statement which will determine whether
orchestration engine is ansible.

Co-Authored-By: Duong Ha-Quang <duonghq@vn.fujitsu.com>

Change-Id: I998a7540de3dcae53acb73de79fb8a8e76cc4225
Closed-Bug: 1649247
2017-02-16 08:15:42 +07:00
Jenkins
7694019238 Merge "Updated from global requirements" 2017-02-16 01:12:35 +00:00
Jenkins
aac84911af Merge "Optimize reconfigure action for congress" 2017-02-15 21:21:01 +00:00
OpenStack Proposal Bot
6f6186a656 Updated from global requirements
Change-Id: If087141fbbef3339f49193cd1558e0d9a246b99d
2017-02-15 20:46:37 +00:00
09a0cc80c3 Update reno for stable/ocata
Change-Id: I99f2932fb74b399a93b3c6547b8d62a595ce6ce6
2017-02-15 17:36:36 +00:00
Eduardo Gonzalez
e01900b3ce Fix chrony genconfig
Closes-Bug: #1665047
Change-Id: Ief0813e4f505574c9b8eee8a59765dadbac474ed
2017-02-15 17:27:36 +00:00
Jenkins
83128d682d Merge "Update the CONTRIBUTING.rst file" 4.0.0.0rc1 2017-02-15 16:43:40 +00:00
Jenkins
a0d2962f48 Merge "Disable elasticsearch output when enable_elasticsearch is no in fluentd" 2017-02-15 16:40:07 +00:00
Jenkins
67d5407db8 Merge "Rename kolla namespace to kolla_ansible" 2017-02-15 15:50:12 +00:00
Jeffrey Zhang
2ae1781d0e Disable elasticsearch output when enable_elasticsearch is no in fluentd
Change-Id: I93fe8141a88d6e0600a1f44fe49d96d7816fae87
Closes-Bug: #1664868
2017-02-15 20:12:33 +08:00
caowei
963e407439 Change freezer service type
Change-Id: I0ea1927fff651bf8fd64a156b86c1378aa4d9d7c
Closes-Bug: #1664936
2017-02-15 19:02:40 +08:00
Jenkins
5b9744e591 Merge "Add default roles used by Barbican" 2017-02-15 08:58:16 +00:00
Jeffrey Zhang
177fbea79a Rename kolla namespace to kolla_ansible
* Rename kolla namespace to kolla_ansible
* remove oslo.config.opts entry points which is uesless
* delete useless tools/version-check.py script

Change-Id: I005dd7223ff23afbb2ce8cbfd0ebec0969102798
2017-02-15 16:34:51 +08:00
caoyuan
c734f53277 Add the missing option for gloabols.yml
- collectd
- remove the unnecessary space

Change-Id: I98c60d29f50bb105ca52cc0060bfcd2b3701e6db
2017-02-15 15:49:14 +08:00
Mauricio Lima
6defea46cb Optimize reconfiguration for collectd
Co-Authored-By: caoyuan <cao.yuan@99cloud.net>
Change-Id: I0604d262965b27b8bf6c560238811f81c830ea1a
Partially-implements: blueprint better-reconfigure
2017-02-15 15:37:02 +08:00
Jenkins
b7e1d40030 Merge "Optimize reconfiguration for karbor" 2017-02-15 07:26:09 +00:00
Jenkins
aaba647633 Merge "Change Barbican default secret store to pkcs11" 2017-02-15 05:02:50 +00:00
Jeffrey Zhang
397d79c296 Fix doc format
Get follwing error when running tox -edocs

doc/bifrost.rst:91: D001 Line too long
doc/manila-hnas-guide.rst:28: D000 Title underline too short.
doc/manila-hnas-guide.rst:28: D000 Title underline too short.
doc/networking-guide.rst:93: D000 Title underline too short.
doc/networking-guide.rst:93: D000 Title underline too short.
doc/multinode.rst:14: D001 Line too long
doc/quickstart.rst:474: D001 Line too long
doc/vagrant-dev-env.rst:129: D001 Line too long

Change-Id: I88090487a4710547224361d29aaf8371f8340c28
2017-02-15 12:17:49 +08:00
Jenkins
c028b6fdd1 Merge "Fix X-Forward-Proto Header Deletion" 2017-02-15 02:49:28 +00:00
Serguei Bezverkhi
35fee342f0 Changing ironic-inspector configuration for kolla-kubernetes
Changing ironic-inspector configuration for kolla-kubernetes

Change-Id: Ib1ff99d2d58ca9f910b8e68e6076359e2e7ec5a0
Closes-Bug: #1664726
2017-02-14 16:50:51 -05:00
Nenad Radojevic
4385fb682c Add default roles used by Barbican
The default roles used by Barbican are missing.
According to the policy.json the Key Manager
comes with, four roles have to be defined.

Change-Id: I8882c2cf328b62e68797e383b26908540d669629
Closes-Bug: #1657742
2017-02-14 17:06:54 +00:00
Jenkins
dd79b8d1d3 Merge "Checking certificate files for octavia" 2017-02-14 16:29:50 +00:00
Jenkins
39ee9697ad Merge "Add the missing condition for config.yml" 2017-02-14 16:23:01 +00:00
Jenkins
fe3bb84a22 Merge "Fix the host_in_groups error in kolla-kubernetes." 2017-02-14 16:00:25 +00:00
Jenkins
510f9b0172 Merge "Do not check security opt in some case in kolla_docker module" 2017-02-14 15:38:44 +00:00
Jenkins
042a5f978e Merge "update dispatcher configurations for database backend" 2017-02-14 15:24:37 +00:00
Jenkins
e84fe597ed Merge "Fix haproxy configure for external placement api listen" 2017-02-14 15:22:40 +00:00
Jeffrey Zhang
a1901d4264 Fix the host_in_groups error in kolla-kubernetes.
* add if orchestration_engine == 'KUBERNETES' for host_in_groups
* use the same indent for host_in_groups variable, otherwise YAML will
  add a '\n' character for each line.

Change-Id: Idf6eecb451281d5cdc16df318bcd8ae9f5561b02
2017-02-14 15:13:50 +00:00