diff options
| author | Steve Baker <sbaker@redhat.com> | 2014-08-29 11:11:59 +1200 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2014-08-29 11:11:59 +1200 |
| commit | d70da16894187d4f029e4352b4103cb629ebdaaf (patch) | |
| tree | 6af1d65d6b0f873183240ffaed8a7c0d6bf2ace9 /etc | |
| parent | 99a11f8633e7fec957495e71b670117a6caba63b (diff) | |
| download | heat-d70da16894187d4f029e4352b4103cb629ebdaaf.tar.gz | |
Detect neutron endpoint on-the-fly
This change does the following:
- reverts commit 04de60093b602c2eac4a612df5d4a2e31424a25d
- reimplements Resource.is_using_neutron to check for neutron by
attempting to create a neutron client
- fix mocking in tests for changes which landed after 04de600
If there is no 'network' entry in the service catalog then
keystoneclient will raise an EndpointNotFound. The context will
already have a keystone client cached which has a full service catalog
locally, so calling is_using_neutron should have no particular overhead.
This fixes a tripleo regression where the autodetection is triggered
before keystone is ready, so that heat-engine fails to start. This
race does not affect devstack as keystone is fully configured before
heat services are started.
Not adding config option networking_service will also prevent
extra work required by downstream installation tools.
Change-Id: I45a6154fa560f672d8d1942bf57f39601110bfc6
Closes-Bug: #1362812
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/heat/heat.conf.sample | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/etc/heat/heat.conf.sample b/etc/heat/heat.conf.sample index d3fc5808e..451836d79 100644 --- a/etc/heat/heat.conf.sample +++ b/etc/heat/heat.conf.sample @@ -73,10 +73,6 @@ # Deprecated. (string value) #onready=<None> -# Select OpenStack component responsible for networking - nova -# or neutron. (string value) -#networking_service=<None> - # # Options defined in heat.common.config |