diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-08-31 17:06:49 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-08-31 17:06:49 +0000 |
commit | ad2d7a31c3f903c3e79f9d8a3e327853190cbc6e (patch) | |
tree | 73c3e40fabf600f8c0e812c5cfbdf590e28b539e | |
parent | f32dbe7838c9cf9b935247a145bd55e806ea44b2 (diff) | |
parent | f2b45776090463a417eeca98db4a6fa55ba0f64b (diff) | |
download | heat-ad2d7a31c3f903c3e79f9d8a3e327853190cbc6e.tar.gz |
Merge "Make sure create ceilometer alarm successful" into stable/liberty5.0.2
-rw-r--r-- | heat/engine/clients/os/ceilometer.py | 3 | ||||
-rw-r--r-- | heat/engine/stack.py | 4 | ||||
-rw-r--r-- | heat/tests/fakes.py | 21 |
3 files changed, 24 insertions, 4 deletions
diff --git a/heat/engine/clients/os/ceilometer.py b/heat/engine/clients/os/ceilometer.py index 12dbb135d..7f361c8be 100644 --- a/heat/engine/clients/os/ceilometer.py +++ b/heat/engine/clients/os/ceilometer.py @@ -40,7 +40,8 @@ class CeilometerClientPlugin(client_plugin.ClientPlugin): 'cacert': self._get_client_option('ceilometer', 'ca_file'), 'cert_file': self._get_client_option('ceilometer', 'cert_file'), 'key_file': self._get_client_option('ceilometer', 'key_file'), - 'insecure': self._get_client_option('ceilometer', 'insecure') + 'insecure': self._get_client_option('ceilometer', 'insecure'), + 'aodh_endpoint': endpoint } return cc.get_client('2', **args) diff --git a/heat/engine/stack.py b/heat/engine/stack.py index 45676a2c4..b65cd7f9b 100644 --- a/heat/engine/stack.py +++ b/heat/engine/stack.py @@ -190,6 +190,10 @@ class Stack(collections.Mapping): self.context = self.stored_context() self.context.roles = self.context.clients.client( 'keystone').auth_ref.role_names + self.context.user_domain = self.context.clients.client( + 'keystone').auth_ref.user_domain_id + self.context.project_domain = self.context.clients.client( + 'keystone').auth_ref.project_domain_id self.clients = self.context.clients diff --git a/heat/tests/fakes.py b/heat/tests/fakes.py index 585875a5f..e94115de8 100644 --- a/heat/tests/fakes.py +++ b/heat/tests/fakes.py @@ -99,7 +99,8 @@ class FakeKeystoneClient(object): def __init__(self, username='test_username', password='password', user_id='1234', access='4567', secret='8901', credential_id='abcdxyz', auth_token='abcd1234', - context=None, stack_domain_id='4321', roles=None): + context=None, stack_domain_id='4321', roles=None, + user_domain_id=None, project_domain_id=None): self.username = username self.password = password self.user_id = user_id @@ -112,6 +113,8 @@ class FakeKeystoneClient(object): self.v3_endpoint = 'http://localhost:5000/v3' self.stack_domain_id = stack_domain_id self.roles = roles or [] + self.user_domain_id = user_domain_id + self.project_domain_id = project_domain_id class FakeCred(object): id = self.credential_id @@ -199,17 +202,29 @@ class FakeKeystoneClient(object): @property def auth_ref(self): - return FakeAccessInfo(roles=self.roles) + return FakeAccessInfo(roles=self.roles, + user_domain=self.user_domain_id, + project_domain=self.project_domain_id) class FakeAccessInfo(object): - def __init__(self, roles): + def __init__(self, roles, user_domain, project_domain): self.roles = roles + self.user_domain = user_domain + self.project_domain = project_domain @property def role_names(self): return self.roles + @property + def user_domain_id(self): + return self.user_domain + + @property + def project_domain_id(self): + return self.project_domain + class FakeEventSink(object): |