diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-15 08:54:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-15 08:54:47 +0000 |
| commit | a4c38cc6ddbfba2301766eced939229cccc31953 (patch) | |
| tree | 38359bea911450f40d2f61dc2fb91d715e0ea643 | |
| parent | 4a21bd9d24a7e2cce219e2cbd6880309c975d2de (diff) | |
| parent | 08af8e029d6e3d785f6387eef294eafad28ad3e1 (diff) | |
| download | trove-a4c38cc6ddbfba2301766eced939229cccc31953.tar.gz | |
Merge "restart_required cfg-param is bool and not string" into proposed/juno2014.2.rc32014.2proposed/juno
| -rw-r--r-- | trove/configuration/views.py | 4 | ||||
| -rw-r--r-- | trove/extensions/mgmt/configuration/views.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/trove/configuration/views.py b/trove/configuration/views.py index db8fa7fc..bde5dcce 100644 --- a/trove/configuration/views.py +++ b/trove/configuration/views.py @@ -118,8 +118,8 @@ class ConfigurationParameterView(object): self.config = config def data(self): - # v1 api expects this to be a 'true' or 'false' string instead of 1/0 - restart_required = 'true' if self.config.restart_required else 'false' + # v1 api is to be a 'true' or 'false' json boolean instead of 1/0 + restart_required = True if self.config.restart_required else False ret = { "name": self.config.name, "datastore_version_id": self.config.datastore_version_id, diff --git a/trove/extensions/mgmt/configuration/views.py b/trove/extensions/mgmt/configuration/views.py index fa45e824..08b51563 100644 --- a/trove/extensions/mgmt/configuration/views.py +++ b/trove/extensions/mgmt/configuration/views.py @@ -24,10 +24,12 @@ class MgmtConfigurationParameterView(object): self.config = config def data(self): + # v1 api is to be a 'true' or 'false' json boolean instead of 1/0 + restart_required = True if self.config.restart_required else False ret = { "name": self.config.name, "datastore_version_id": self.config.datastore_version_id, - "restart_required": self.config.restart_required, + "restart_required": restart_required, "type": self.config.data_type, "deleted": self.config.deleted, "deleted_at": self.config.deleted_at, |