Merge pull request #18414 from sebest/develop

fixing some documentation in boto_* states

salt/modules/boto_elb.py

@@ -168,7 +168,7 @@ def create(name, availability_zones, listeners=None, subnets=None,
             return False
     except boto.exception.BotoServerError as e:
         log.debug(e)
-        msg = 'Failed to create ELB {0}'.format(name)
+        msg = 'Failed to create ELB {0}: {1}'.format(name, e.message)
         log.error(msg)
         return False
 
@@ -233,7 +233,7 @@ def create_listeners(name, listeners=None, region=None, key=None, keyid=None,
         return True
     except boto.exception.BotoServerError as e:
         log.debug(e)
-        msg = 'Failed to create ELB listeners on {0}'.format(name)
+        msg = 'Failed to create ELB listeners on {0}: {1}'.format(name, e.message)
         log.error(msg)
         return False
 
@@ -259,7 +259,7 @@ def delete_listeners(name, ports, region=None, key=None, keyid=None,
         return True
     except boto.exception.BotoServerError as e:
         log.debug(e)
-        msg = 'Failed to delete ELB listeners on {0}'.format(name)
+        msg = 'Failed to delete ELB listeners on {0}: {1}'.format(name, e.message)
         log.error(msg)
         return False
 
@@ -285,7 +285,7 @@ def enable_availability_zones(name, availability_zones, region=None, key=None,
         return True
     except boto.exception.BotoServerError as e:
         log.debug(e)
-        msg = 'Failed to enable availability_zones on ELB {0}'.format(name)
+        msg = 'Failed to enable availability_zones on ELB {0}: {1}'.format(name, e.message)
         log.error(msg)
         return False
 
@@ -311,7 +311,7 @@ def disable_availability_zones(name, availability_zones, region=None, key=None,
         return True
     except boto.exception.BotoServerError as e:
         log.debug(e)
-        msg = 'Failed to disable availability_zones on ELB {0}'.format(name)
+        msg = 'Failed to disable availability_zones on ELB {0}: {1}'.format(name, e.message)
         log.error(msg)
         return False
 
@@ -337,7 +337,7 @@ def attach_subnets(name, subnets, region=None, key=None, keyid=None,
         return True
     except boto.exception.BotoServerError as e:
         log.debug(e)
-        msg = 'Failed to attach ELB {0} on subnets.'.format(name)
+        msg = 'Failed to attach ELB {0} on subnets: {1}'.format(name, e.message)
         log.error(msg)
         return False
 
@@ -363,7 +363,7 @@ def detach_subnets(name, subnets, region=None, key=None, keyid=None,
         return True
     except boto.exception.BotoServerError as e:
         log.debug(e)
-        msg = 'Failed to detach ELB {0} from subnets.'.format(name)
+        msg = 'Failed to detach ELB {0} from subnets: {1}'.format(name, e.message)
         log.error(msg)
         return False
 
@@ -394,7 +394,7 @@ def get_attributes(name, region=None, key=None, keyid=None, profile=None):
         return ret
     except boto.exception.BotoServerError as e:
         log.debug(e)
-        log.error('ELB {0} does not exist.'.format(name))
+        log.error('ELB {0} does not exist: {1}'.format(name, e.message))
         return {}
 
 
@@ -470,7 +470,7 @@ def get_health_check(name, region=None, key=None, keyid=None, profile=None):
         return ret
     except boto.exception.BotoServerError as e:
         log.debug(e)
-        log.error('ELB {0} does not exist.'.format(name))
+        log.error('ELB {0} does not exist: {1}'.format(name, e.message))
         return {}
 
 
@@ -492,7 +492,7 @@ def set_health_check(name, health_check, region=None, key=None, keyid=None,
         log.info('Configured health check on ELB {0}'.format(name))
     except boto.exception.BotoServerError as e:
         log.debug(e)
-        log.info('Failed to configure health check on ELB {0}'.format(name))
+        log.info('Failed to configure health check on ELB {0}: {1}'.format(name, e.message))
         return False
     return True
 

salt/states/boto_elb.py

@@ -31,7 +31,7 @@ passed in as a dict, or as a string to pull from pillars or minion config:
     myprofile:
         keyid: GKTADJGHEIQSXMKKRBJ08H
         key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs
-            region: us-east-1
+        region: us-east-1
 
 .. code-block:: yaml
 
@@ -39,6 +39,10 @@ passed in as a dict, or as a string to pull from pillars or minion config:
         boto_elb.present:
             - name: myelb
             - region: us-east-1
+            - availability_zones:
+                - us-east-1a
+                - us-east-1c
+                - us-east-1d
             - keyid: GKTADJGHEIQSXMKKRBJ08H
             - key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs
             - listeners:

salt/states/boto_route53.py

@@ -31,7 +31,7 @@ passed in as a dict, or as a string to pull from pillars or minion config:
     myprofile:
         keyid: GKTADJGHEIQSXMKKRBJ08H
         key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs
-            region: us-east-1
+        region: us-east-1
 
 .. code-block:: yaml
 

salt/states/boto_sqs.py

@@ -31,7 +31,7 @@ passed in as a dict, or as a string to pull from pillars or minion config:
     myprofile:
         keyid: GKTADJGHEIQSXMKKRBJ08H
         key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs
-            region: us-east-1
+        region: us-east-1
 
 .. code-block:: yaml