Fixes bug #1173575
This is currently broken since heat-engine always listens to the
'engine' topic and there isn't actually a good use case for this to be
configurable, so let's kill it.
Change-Id: I35c0292c921f81857f80a7f111df5ac330d54ecf
Fixes bug #1173573
We currently send engine RPCs to the 'engine.$host' topic means that
it is impossible to run heat-api and heat-engine on different
machines because you can't configure heat-api with the hostname of
heat-engine.
Fix this simply by sending RPCs to 'engine' which heat-engine. We have
always listened on this topic, so there is no backwards compat
concerns.
This is somewhat related to the multiple-engines blueprint, but
doesn't really help or hinder it.
Change-Id: Ibd4dc948ace4476bfa8e7fdc86e948a622416e58
The structure of the program is compromised by doing too much logic in
the import phase. We can read the code more cleanly if we can see where
the intended initialization code is called. This may make tests slightly
more tedious to write, but that should be handled by writing generic
fixtures which can be reused for exactly this purpose.
Change-Id: I1d221e2f90d1f6e89717a37d2128caabd077d30a
Load a single api-paste.ini file, specified by config
Delete unused paste.ini files
Update docs for new paste.ini and config arrangement
There will be a corresponding devstack change, and once this is in
I will email the packagers on the packaging implications
Change-Id: Ic10b1a486094d15bfd832f0f934e6268ec323085
Just like keystoneclient.middleware.auth_token
first checks paste.ini file then .conf file when fetching
a config value
Change-Id: I9db9744d0ab12fcf486de9a9d3f8e870a4ff66de
Previously resources would be left in the CREATE_IN_PROGRESS state in the
event of a timeout or the thread being cancelled (due to a delete being
requested while the stack was still being created). We should instead put
these resources into the CREATE_FAILED state when this occurs, thus
creating an event with the reason.
Change-Id: I05956aa9ef26941b79cef9dbf0cb6a347047d199
We don't want to store any state in the Instance object, instead take
advantage of the new mechanism whereby the result of handle_create() is
passed to check_active().
This makes the autoscaling code uglier for now (since it must still store
the instance state in the instance), but this will go away when we move to
using co-routines to create resources in parallel.
Change-Id: Ib11c8da22900453eb9713eba5106859c8a09dbe2
These are not currently used anywhere in heat-engine, and I'm
not comfortable with the service password going over the (controller)
network.
If heat-engine needs access to these in the future then they can always
be configured in heat-engine.conf, or the operation can be performed
in the api and the results put into the context.
Change-Id: I81aab6b5a2c9aa7d6412531f70108857cbfa637b
keystone auth_token middleware now allows heat to have auth_token
configuration in heat-api.conf. Moves the example of
auth_token configuration from heat-api-paste.ini to heat-api.conf.
This simplifies user configuations and users is no longer required
to edit heat-api-paste.ini.
This does not break backward compatibility. auth_token first
tries the configurations in /etc/heat/heat-api-paste.ini and then the
above configurations. Thus a user who already uses heat-api-paste.ini
does not need to change it.
Change-Id: Ia0a4d912cd7380094e121ee4af733277ca4d812e
Blueprint: keystone-middleware
Replace old forked auth_token with a subclass
of keystoneclient middleware.
The advantages of moving to keystoneclient middleware:
- can use v3 (or v2) keystone api
- PKI tokens
- token revocation
The subclass sets the following headers to be consumed by our
request context filter:
- X-Admin-User
- X-Admin-Pass
- X-Admin-Tenant-Name
- X-Auth-Url
The need to override _build_user_headers should be a short-term thing,
X-Admin-* isn't actually used currently, and there are a few options
that need to be discussed for getting X-Auth-Url to the engine.
Change-Id: Iacc5046fbf559724a4ae0bd6091d662e23d65544
Blueprint: keystone-middleware
Mechanical translation of the deprecated except x,y:
construct. the except x as y: construct works with
all python 2.6+ versions
Change-Id: Iad349b8079a01bbd66a22800ae2fcdfcde03b377
Don't make assumptions about argument types, get the line number from the
message object.
Fixes bug #1171420
Change-Id: Id0b1b254a1561941dea8ab5bb23aea1f936e7f0b
We always pass host=None to _engine_topic() which means that we always
construct a topic using CONF.engine_topic and CONF.host.
And since RpcProxy methods falls back to the topic supplied to its
constructor, we never need to explicitly pass it.
We can safely remove the _engine_topic() method and the passing of an
explicit topic to RpcProxy methods and replace it with constructing the
correct topic at construction time, without causing any functional
changes.
While we're at it, replace the last use of the variable name FLAGS with
CONF.
Change-Id: Iefdc6b78a068975ac45b10d6b53210cb283d2ef8
OpenShift Origin images require a lot of packages. So, although the OpenShift
Origin HEAT template can be adapted to run with JEOS images, they would take
> 25 min to spin up. Instead, I have opted to create heavier images to speed up
machine creation. @See https://github.com/sdake/heat-jeos/pull/49
Change-Id: I371d28a9833a48a6b588f907cce3298b30552e90
Crypto.Random has been introduced by pycrypto 2.1 but in RHEL6 and
derivates you will only find pycrypto 2.0.1
Change-Id: Ib601981b0b8fcb5b3e8fc8761ee05adf7f6574fa
The stack was not being fully created, because the calls to the mock
functions were not present for the second instance.
Change-Id: I894473533eb40133e4c22facbbee749a971cec89
Avoid storing the state of instances that are currently being created in
the instance group resource itself. Instead, ensure that they are returned
from handle_create() and take advantage of that result being passed back in
to check_active().
Change-Id: Ie2c75eaee620aa0599665168bfb92b345128d392
All resources that implement check_active() will require some state to be
retained from the call to handle_create(). Saving this as state in the
Resource object results in repeated, ugly, and potentially error-prone
code.
Instead, allow a subclass-defined state object returned from
handle_create() to be passed to check_active(). This ensures that the state
is limited in scope to where it is meaningful (during the create
operation), and that it will be garbage-collected at the appropriate time,
even if an unexpected exception occurs e.g. because a thread is cancelled.
Change-Id: I9d690b44a066aaf33970562a2b9a55c633a7d4e8
F18 contains apache 2.4 which requires a different syntax to enable
non-local access to the wordpress install
fixes bug #1166897
Change-Id: Ia63cceeba35904f05a1b4cf76fc075d3cdc7cd86
Update GettingStarted to drop references to F16/essex and add the
password sed which is required when running grizzly installed via
tools/openstack on Fedora
Change-Id: I08d265e2e2388b54a6aa9f47c4930c32f71f3e93
The cloudwatch paste config should specify service/heat
like the other API services, not admin/admin
Change-Id: I0590c88edd6b544aba467ab171dd7f610b50c380
Update tools/openstack so it works with the grizzly preview repo
(tested on F18 with both grizzly repo and folsom distro packages)
fixes bug #1164605
Change-Id: I347a53c9be677131dad37f9fbeb1ed5eb9cb810b
