213 Commits

Author SHA1 Message Date
Sam Yaple
1c177f3827 Revert "Make heat work"
This reverts commit 7524b3770fedd730bf2c49d26a94135c5357781b.

Liberty uses heat_user_domain and works and this should too. The
bootstrap process itself must have changed or another part of the
config. Either way that needs to be fixed so we can do proper upgrades.
Basically, dont change the heat domain out from under the user).

Change-Id: I32ae3ef90d340a83b09c09860af8f3635c1a07a5
2016-03-24 12:54:05 +00:00
Steven Dake
7524b3770f Make heat work
Fix the domain user to point at heat instead of some nonsensenical
value.  Now stack-create works properly.

Change-Id: If2bc57c2516ffe724999515bb6aa3eeb31a0c980
Co-Authored-By: Angus Salkeld <asalkeld@mirantis.com>
Closes-Bug: #1553565
2016-03-23 23:43:59 -04:00
Angus Salkeld
d68644386f Disable deprecated heat plugins.
Note: you will get the following logs:
WARNING heat.engine.environment [] OS::Heat::HARestarter is DEPRECATED.
WARNING heat.engine.environment [] Removing OS::Heat::HARestarter from OS::Heat::HARestarter

Change-Id: I071e4689110ad03da14b02ba9f0a1fd8463b8b55
Closes-bug: 1559828
2016-03-22 08:53:29 +10:00
Jenkins
11adcd546b Merge "Fix heat endpoint registration" 2016-03-21 15:55:27 +00:00
SamYaple
59298332fc Fix heat endpoint registration
This got lost in the keystone v3 switchover.

Change-Id: I014c28e71335672153df79be2110e7585d7a21c0
Related-Bug: 1553565
2016-03-21 03:23:17 +00:00
SamYaple
56fd071bcb Change deprecated options throughout Kolla
These options have all be deprecated/removed. This switches all
options to thier proper mitaka values.

TrivialFix
Change-Id: Ica8d5ea0d48da01ee11672a32890431acd6a306d
2016-03-19 23:55:05 +00: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
Martin André
cb43cbcc93 Use variables for auth_uri and auth_url protocols
Change-Id: Icf5de0684b10c32cc6e29b62d183705d423b4333
Closes-Bug: #1555989
2016-03-11 18:09:39 +09:00
Steven Dake
21ecd9925a Upgrade Heat
This could possibly use gold plating in how bootstrapping
operates to use shade rather than the shell in the container.
It is unclear why stack create failed prior to this patch, but
that fact hasn't changed.  I think the heat domains are not setup
properly in the configuration files, meaning that the domain ID
must be created outside of Heat and registered in the configuration
file.  This is covered in Bug #1553565.

Change-Id: I490d4dd68a101f388c0ecb4acab54d5eaa6e314e
Partially-Implements: blueprint kolla-upgrade
Implements: blueprint upgrade-heat
2016-03-09 03:50:03 -05:00
Dave McCowan
1c31951b85 Use internalURL for internal communication
When using separate networks for external APIs and internal
APIs, services need to be configured to use the internal APIs.
The default is typically publicURL.

TrivialFix

Change-Id: I24da63220a65e210c37d9f24b6d76a0031d66f3d
2016-03-07 09:28:48 -05:00
Jenkins
e1c3467bd0 Merge "Reconfigure for Heat" 2016-03-03 22:54:42 +00:00
SamYaple
57124620ab Fix Keystone v3 and Horizon
After our switch to keystone-manage bootstrap Horizon is not happy
due to v3 not being setup correctly. This patch fixes that

This also includes removal of unused variables (transforms them into
endpoint url variables)

TrivialFix
Change-Id: I1e04db8c24049f80e974c063f03068a2ab32a563
2016-03-03 15:44:53 +00:00
Steven Dake
b8e4159bf3 Reconfigure for Heat
Add reconfiguration for heat-api, heat-engine, heat-api-cfn.

Change-Id: I60d538d08eaf1db38876cccbb0db530b52d302b8
Partially-Implements: blueprint kolla-reconfig
2016-03-02 15:57:18 -07:00
Jenkins
0c7cf6fdc4 Merge "Modify a hard-code keystone username in neutron and heat." 2016-02-28 18:52:49 +00:00
SamYaple
d3cfb2052a Change kolla_internal_address variable
Due to poor planning on our variable names we have a situation where
we have "internal_address" which must be a VIP, but "external_address"
which should be a DNS name. Now with two vips "external_vip_address"
is a new variable.

This corrects that issue by deprecating kolla_internal_address and
replacing it with 4 nicely named variables.

kolla_internal_vip_address
kolla_internal_fqdn
kolla_external_vip_address
kolla_external_fqdn

The default behaviour will remain the same, and the way the variable
inheritance is setup the kolla_internal_address variable can still be
set in globals.yml and propogate out to these 4 new variables like it
normally would, but all reference to kolla_internal_address has been
completely removed.

Change-Id: I4556dcdbf4d91a8d2751981ef9c64bad44a719e5
Partially-Implements: blueprint ssl-kolla
2016-02-26 20:00:09 +00:00
wangtianfa
11572e1c4b Modify a hard-code keystone username in neutron and heat.
Changed hard-code keystone username for neutron and heat in the
neutron.conf template and heat.conf template.

TrivialFix

Change-Id: Ibdd1422bd4cae5011f9fc5f4de7dfc58601dca1d
2016-02-26 04:42:26 -05:00
Jeffrey Zhang
d26c259754 Add the default empty reconfigure.yml file to all roles
DocImpact

Partially-implements: bp kolla-reconfig
Change-Id: I9738e80960bcfbef18d1ef1b7942f81c45684e85
2016-02-25 09:32:53 +08:00
Éric Lemoine
82264ab7d6 Make Heka collect Heat logs
Partially implements: blueprint heka
Change-Id: Ie22c4326c6ec2a3426b0c3b8fda4554b1b2541b0
2016-02-19 21:56:10 +00:00
Jenkins
6e622fa534 Merge "Move socket binding to named_volume" 2016-02-17 02:06:26 +00:00
Jenkins
c6da765b49 Merge "Use variables to specify http or https when constructing URLs" 2016-02-16 22:37:27 +00:00
Jenkins
18ab9adb56 Merge "Use trusts in heat.conf" 2016-02-16 15:16:50 +00:00
SamYaple
690e6853de Move socket binding to named_volume
The extend_start.sh script for rsyslog is removed as it is no longer
needed. Docker no longer binds to /dev/log or /run/kolla/log

Closes-Bug: #1544545
Change-Id: Ic0a323a26ee4e9e15baf4598285844a8a4955f23
2016-02-16 14:42:41 +00:00
Jenkins
84f43146dc Merge "Use uppercase 'S' in word "OpenStack"" 2016-02-15 16:23:37 +00:00
Dave McCowan
1cedf77f19 Use variables to specify http or https when constructing URLs
To allow for TLS to protect the service endpoints, the protocol
in the URLs for the endpoints will be either http or https.

This patch removes the hardcoded values of http and replaces them
with variables that can be adjusted accordingly in future patches.

Change-Id: Ibca6f8aac09c65115d1ac9957410e7f81ac7671e
Partially-implements: blueprint ssl-kolla
2016-02-15 09:48:58 -05:00
venkatamahesh
70de590a11 Use uppercase 'S' in word "OpenStack"
Change-Id: I27ca0ea75f3d6a4371c91b3cb2c7a999ec90fbc4
2016-02-15 12:37:30 +00:00
SamYaple
e8d66766f0 Fix gate for docker 1.10
Docker 1.10 has broken the gate and this patch will correct that
breakage.

The issue comes with rsyslog. Due to a commit in Docker 1.10 [1] we
must change the way we get the log socket for rsyslog. The /dev/
folder will no longer populate as we used it. So instead we simply
make a new socket in a path we control and share that to the correct
location in the containers.

Additionally, adjust the gate for new Docker daemon.

[1] https://github.com/docker/docker/pull/16639
Partially-Implements: blueprint kolla-upgrade
Change-Id: I881a2ecdf6d7b35991e1d38a3f3e60d022d6577f
2016-02-06 06:48:53 +00:00
SamYaple
80b7266ed1 Rename kolla_ansible to kolla_toolbox
This change is needed for clarity. We have a kolla-ansible script.
We have a kolla-mesos repo. We plan to have a kolla-ansible repo.
Already we have had far too much confusion about whether we are
talking about the container or the project. Naming this kolla-toolbox
eliminates all of that confusion and its probably a bit more accurate
of a name too.

Closes-Bug: #1541053
Change-Id: I8fd1f49d5a22b36ede5b10f46b9fe02ddda9007e
2016-02-02 18:12:15 +00:00
SamYaple
6d8959a962 Update all bootstraps to use Label
Add bootstrap label to all bootstrap containers to ensure that when
the a new container is launched a difference is seen between it and
the bootstrap container since we cannot rely on ENV variables for
this. This only affects mariadb at this stage, but it is needed to
ensure rabbitmq works when we switch to named volumes.

Change-Id: Ia022af26212d2e5445c06149848831037a508407
Closes-Bug: #1538136
2016-01-28 20:26:41 +00:00
Michal Rostecki
64b767f9f6 Use trusts in heat.conf
Change-Id: Ie91b3498e9f9d0d74a502ba6945db531ef967516
Closes-Bug: #1492736
2016-01-28 11:15:27 +01:00
Allen Gao
727a69e41e Add the missed stub upgrade.yml
After introduction of pull action and turing every main.yml into
{{action}}.yml we lost ability to perform upgrade.

Change-Id: Id6b5921bd1e3e7b196c4b3223920e51ae5e0b840
Closes-Bug: #1538210
2016-01-27 18:34:51 +00:00
Jenkins
801f84ed11 Merge "Add debug option in config file" 2016-01-21 22:44:03 +00:00
Ice Yao
e1ff26612f remove option verbose define in defaults/main.yml
References: https://review.openstack.org/#/c/269042/

TrivialFix

Change-Id: Ief08781342a06f956fc4cf00ba4383759da8c897
2016-01-20 16:17:05 +08:00
Ice Yao
83df0f8612 Add debug option in config file
Config file use *_logging_debug as debug default value

Change-Id: I41102fff9056a82f7307694252adff0aedcf2658
2016-01-20 15:44:27 +08:00
Wanlong Gao
66f5802daa Use driver instead of deprecated notification_driver in config
TrivialFix
https://review.openstack.org/#/c/249508/

Change-Id: Ie2732ee116b6b4b3e0210eb1f62fc72878d8c277
2016-01-19 17:09:19 +08:00
Wanlong Gao
181b4947dd Use auth_type instead of deprecated auth_plugin
TrivialFix

Change-Id: I33924d6de43126ff8523883eebce703c976f9a1a
2016-01-16 07:44:14 +08:00
Jenkins
8c54c82b7d Merge "Allow heat role to pull images" 2016-01-06 08:17:20 +00:00
SamYaple
260187c6fa Allow heat role to pull images
Change-Id: Idce62ce7c1c10c53e8e42091d6c47da4b770c261
Partially-Implements: blueprint pre-pull-images
2016-01-06 04:23:28 +00:00
Martin André
78f442a6be Remove unused heat_registry_* variables
TrivialFix

Change-Id: Ifded72fbe34892e66fea95f31ebf27429f2d10f1
2016-01-06 09:46:57 +09:00
SamYaple
665d0c9d30 Convert heat to kolla_docker
Change-Id: If8153a79d6e6784c757dfcca7f66b2e0c1416bd4
Partially-Implements: blueprint kolla-docker-module
2015-12-31 16:38:56 +00:00
Jenkins
027e70f9a2 Merge "Simplify config creation" 2015-12-23 13:19:08 +00:00
Jenkins
4a2e728688 Merge "Convert to pymysql" 2015-12-22 15:47:02 +00:00
SamYaple
026942e9c5 Convert to pymysql
Closes-Bug: #1528432
Change-Id: I6e56f283521b29678964cb655ac3cff2d13b8246
2015-12-22 04:30:32 +00:00
SamYaple
ed82afa8e9 Simplify config creation
Convert config creation from a playbook to an action_plugin. This
reduces the complexity and confusion while retaining the same augment
structure and flexibility.

This allows us to remove the 0-byte files as requirements. They will
still be used if they are present (this means we require additional
documentation around them).

DocImpact
Closes-Bug: #1528430
Change-Id: I2c789f6be9f195c7771ca093a6d59499564b4740
2015-12-22 04:28:53 +00:00
OTSUKA, Yuanying
903c7d4c3f Fix retrieving api_interface
In heterogeneous environment, api_interfaces are different each other.
So we should specify it from hostvars.

Implements: bp configure-network-interface
Change-Id: Id15d70bfb9ebb62a64a3847a6b77407efb171dbe
2015-12-16 15:55:11 +09:00
Michal Rostecki
febcb600f1 Source installation in virtualenv
Use virtualenv for installation of OpenStack projects and
dependencies to avoid conflicts with Python libraries installed
by non-OpenStack binary packages.

Change-Id: I21ecd673b2e93335b1d3dd4e279e940c9d694c3c
Implements: blueprint virtualenv
2015-11-27 10:22:17 +01:00
Sam Yaple
970617b80a Make the database json variable more readable
Additionally remove tty from the container cleanup docker section. It
was added in a sed in a previous patchset by serves no purpose.

Change-Id: Ib617870616bca687f72ffaa44b2e9a3a11ef1011
Partially-Implements: blueprint cleanup-playbooks
2015-11-23 17:24:22 +00:00
Hui Kang
790bf336d5 Fix bootstrap for services
The bootstrap tasks could be started on any node listed in the
site.yml

The issue is that all the tasks must run on the same node, and the
only node that all the tasks can run on is the 'api' node due to
needing to start the bootstrap container which binds in the configs.

delegate_to is required to ensure that the proper node gets the task.

Co-Authored-By: Sam Yaple <sam@yaple.net>
Change-Id: Ica04ab366777a571a92212ac22c482f1881d4ecd
Closes-Bug: #1513598
Related-Bug: #1513439
2015-11-23 17:09:36 +00:00
Sam Yaple
6b28343017 Incorrect parsed variable name
database_user_create was not correctly referenced when parsing the
variable names. This could never actually lead to a situation that
reported a false change, but it could break an operation if you were
using the --step option with ansible and skipped the database create
task.

TrivialFix
Backport: Liberty

Change-Id: Idf69fffcc3814f509448ccea11b7d175f074ccf1
2015-11-09 10:47:15 +00:00
Jenkins
037bdca42d Merge "bootstrap takes place on the wrong node" 2015-11-06 03:32:36 +00:00