Merge "Update default Nova API version to 2.53(Pike)"

2017-09-02 09:00:07 +00:00
parent 2ea7d61ac8 cf92ece936
commit c9a43d8da4
2 changed files with 2 additions and 2 deletions
--- a/watcher/conf/nova_client.py
+++ b/watcher/conf/nova_client.py
@@ -23,7 +23,7 @@ nova_client = cfg.OptGroup(name='nova_client',

 NOVA_CLIENT_OPTS = [
    cfg.StrOpt('api_version',
-               default='2',
+               default='2.53',
               help='Version of Nova API to use in novaclient.'),
    cfg.StrOpt('endpoint_type',
               default='publicURL',
--- a/watcher/decision_engine/model/element/node.py
+++ b/watcher/decision_engine/model/element/node.py
@@ -33,7 +33,7 @@ class ServiceState(enum.Enum):
 class ComputeNode(compute_resource.ComputeResource):

    fields = {
-        "id": wfields.NonNegativeIntegerField(),
+        "id": wfields.StringField(),
        "hostname": wfields.StringField(),
        "status": wfields.StringField(default=ServiceState.ENABLED.value),
        "state": wfields.StringField(default=ServiceState.ONLINE.value),