From 4fc2499243f0dba0444581eaaf2c3a156f19fa65 Mon Sep 17 00:00:00 2001
From: Maciej Kwiek <mkwiek@mirantis.com>
Date: Tue, 3 Nov 2015 12:11:53 +0100
Subject: [PATCH] Fuel plugin builder accepts 'master' as task role

Schema for all versions was updated to accept also 'master' string as
deployment task role, in addition to previous possible values:
'*' string and array of strings matching '^[0-9a-zA-Z_-]+$' regex.

Closes-bug: #1510354
DocImpact

Change-Id: Iaaf17bf42efb27beda23cf6a46137e380f8569c0
---
 fuel_plugin_builder/tests/test_validator_v3.py | 11 +++++++++++
 fuel_plugin_builder/validators/schemas/base.py |  2 +-
 fuel_plugin_builder/validators/schemas/v2.py   |  2 +-
 fuel_plugin_builder/validators/schemas/v3.py   |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/fuel_plugin_builder/tests/test_validator_v3.py b/fuel_plugin_builder/tests/test_validator_v3.py
index 5150587..d9e28c8 100644
--- a/fuel_plugin_builder/tests/test_validator_v3.py
+++ b/fuel_plugin_builder/tests/test_validator_v3.py
@@ -210,6 +210,17 @@ class TestValidatorV3(BaseValidator):
                     'stage': 'post_deployment',
                     'role': '*'
                 },
+                {
+                    'type': 'puppet',
+                    'parameters': {
+                        'timeout': 3,
+                        'retries': 10,
+                        'puppet_manifest': 'xx',
+                        'puppet_modules': 'xxx'
+                    },
+                    'stage': 'post_deployment',
+                    'role': 'master'
+                },
             ]
         ]
 
diff --git a/fuel_plugin_builder/validators/schemas/base.py b/fuel_plugin_builder/validators/schemas/base.py
index 4aa9124..2e37703 100644
--- a/fuel_plugin_builder/validators/schemas/base.py
+++ b/fuel_plugin_builder/validators/schemas/base.py
@@ -149,7 +149,7 @@ class BaseSchema(object):
                 'role': {
                     'oneOf': [
                         self.list_of_strings,
-                        {'enum': ['*']}]}}
+                        {'enum': ['*', 'master']}]}}
         }
 
     @property
diff --git a/fuel_plugin_builder/validators/schemas/v2.py b/fuel_plugin_builder/validators/schemas/v2.py
index b57970f..d222077 100644
--- a/fuel_plugin_builder/validators/schemas/v2.py
+++ b/fuel_plugin_builder/validators/schemas/v2.py
@@ -83,7 +83,7 @@ class SchemaV2(BaseSchema):
                 'role': {
                     'oneOf': [
                         self.list_of_strings,
-                        {'enum': ['*']}]}}
+                        {'enum': ['*', 'master']}]}}
         }
 
     @property
diff --git a/fuel_plugin_builder/validators/schemas/v3.py b/fuel_plugin_builder/validators/schemas/v3.py
index d9b26a9..81e3374 100644
--- a/fuel_plugin_builder/validators/schemas/v3.py
+++ b/fuel_plugin_builder/validators/schemas/v3.py
@@ -29,7 +29,7 @@ class SchemaV3(SchemaV2):
         return {
             'oneOf': [
                 self.task_group,
-                {'enum': ['*']}
+                {'enum': ['*', 'master']}
             ]
         }