Native YAML, improve quotation (#3643)

7 files changed, 41 insertions, 33 deletions

diff --git a/cloud/amazon/route53_facts.py b/cloud/amazon/route53_facts.py
index 15379688..2cb84b03 100644
--- a/cloud/amazon/route53_facts.py
+++ b/cloud/amazon/route53_facts.py
@@ -134,7 +134,7 @@ EXAMPLES = '''
   route53_facts:
     profile: account_name
     query: record_sets
-    hosted_zone_id: 'ZZZ1111112222'
+    hosted_zone_id: ZZZ1111112222
     max_items: 20
   register: record_sets
 
@@ -149,13 +149,13 @@ EXAMPLES = '''
   route53_facts:
     query: health_check
     health_check_method: failure_reason
-    health_check_id: '00000000-1111-2222-3333-12345678abcd'
+    health_check_id: 00000000-1111-2222-3333-12345678abcd
   register: health_check_failure_reason
 
 - name: Retrieve reusable delegation set details
   route53_facts:
     query: reusable_delegation_set
-    delegation_set_id: 'delegation id'
+    delegation_set_id: delegation id
   register: delegation_sets
 
 '''
diff --git a/cloud/centurylink/clc_aa_policy.py b/cloud/centurylink/clc_aa_policy.py
index 5ba0ac35..bf5f800f 100644
--- a/cloud/centurylink/clc_aa_policy.py
+++ b/cloud/centurylink/clc_aa_policy.py
@@ -74,13 +74,14 @@ EXAMPLES = '''
   tasks:
     - name: Create an Anti Affinity Policy
       clc_aa_policy:
-        name: 'Hammer Time'
-        location: 'UK3'
+        name: Hammer Time
+        location: UK3
         state: present
       register: policy
 
     - name: debug
-      debug: var=policy
+      debug:
+        var: policy
 
 ---
 - name: Delete AA Policy
@@ -90,13 +91,14 @@ EXAMPLES = '''
   tasks:
     - name: Delete an Anti Affinity Policy
       clc_aa_policy:
-        name: 'Hammer Time'
-        location: 'UK3'
+        name: Hammer Time
+        location: UK3
         state: absent
       register: policy
 
     - name: debug
-      debug: var=policy
+      debug:
+        var: policy
 '''
 
 RETURN = '''
diff --git a/cloud/centurylink/clc_firewall_policy.py b/cloud/centurylink/clc_firewall_policy.py
index c26128a4..78a334a6 100644
--- a/cloud/centurylink/clc_firewall_policy.py
+++ b/cloud/centurylink/clc_firewall_policy.py
@@ -126,7 +126,7 @@ EXAMPLES = '''
         source_account_alias: WFAD
         location: VA1
         state: absent
-        firewall_policy_id: 'c62105233d7a4231bd2e91b9c791e43e1'
+        firewall_policy_id: c62105233d7a4231bd2e91b9c791e43e1
 '''
 
 RETURN = '''
diff --git a/cloud/centurylink/clc_group.py b/cloud/centurylink/clc_group.py
index 661196b7..76364a02 100644
--- a/cloud/centurylink/clc_group.py
+++ b/cloud/centurylink/clc_group.py
@@ -83,13 +83,14 @@ EXAMPLES = '''
   tasks:
     - name: Create / Verify a Server Group at CenturyLink Cloud
       clc_group:
-        name: 'My Cool Server Group'
-        parent: 'Default Group'
+        name: My Cool Server Group
+        parent: Default Group
         state: present
       register: clc
 
     - name: debug
-      debug: var=clc
+      debug:
+        var: clc
 
 # Delete a Server Group
 
@@ -101,14 +102,14 @@ EXAMPLES = '''
   tasks:
     - name: Delete / Verify Absent a Server Group at CenturyLink Cloud
       clc_group:
-        name: 'My Cool Server Group'
-        parent: 'Default Group'
+        name: My Cool Server Group
+        parent: Default Group
         state: absent
       register: clc
 
     - name: debug
-      debug: var=clc
-
+      debug:
+        var: clc
 '''
 
 RETURN = '''
diff --git a/cloud/centurylink/clc_publicip.py b/cloud/centurylink/clc_publicip.py
index 98e2e15d..531f19ca 100644
--- a/cloud/centurylink/clc_publicip.py
+++ b/cloud/centurylink/clc_publicip.py
@@ -81,17 +81,18 @@ EXAMPLES = '''
   tasks:
     - name: Create Public IP For Servers
       clc_publicip:
-        protocol: 'TCP'
+        protocol: TCP
         ports:
-            - 80
+          - 80
         server_ids:
-            - UC1TEST-SVR01
-            - UC1TEST-SVR02
+          - UC1TEST-SVR01
+          - UC1TEST-SVR02
         state: present
       register: clc
 
     - name: debug
-      debug: var=clc
+      debug:
+        var: clc
 
 - name: Delete Public IP from Server
   hosts: localhost
@@ -101,13 +102,14 @@ EXAMPLES = '''
     - name: Create Public IP For Servers
       clc_publicip:
         server_ids:
-            - UC1TEST-SVR01
-            - UC1TEST-SVR02
+          - UC1TEST-SVR01
+          - UC1TEST-SVR02
         state: absent
       register: clc
 
     - name: debug
-      debug: var=clc
+      debug:
+        var: clc
 '''
 
 RETURN = '''
diff --git a/cloud/centurylink/clc_server.py b/cloud/centurylink/clc_server.py
index 3cb44040..f98cd54e 100644
--- a/cloud/centurylink/clc_server.py
+++ b/cloud/centurylink/clc_server.py
@@ -249,7 +249,7 @@ EXAMPLES = '''
     name: test
     template: ubuntu-14-64
     count: 1
-    group: 'Default Group'
+    group: Default Group
     state: present
 
 - name: Ensure 'Default Group' has exactly 5 servers
@@ -257,22 +257,25 @@ EXAMPLES = '''
     name: test
     template: ubuntu-14-64
     exact_count: 5
-    count_group: 'Default Group'
-    group: 'Default Group'
+    count_group: Default Group
+    group: Default Group
 
 - name: Stop a Server
   clc_server:
-    server_ids: ['UC1ACCT-TEST01']
+    server_ids:
+      - UC1ACCT-TEST01
     state: stopped
 
 - name: Start a Server
   clc_server:
-    server_ids: ['UC1ACCT-TEST01']
+    server_ids:
+      - UC1ACCT-TEST01
     state: started
 
 - name: Delete a Server
   clc_server:
-    server_ids: ['UC1ACCT-TEST01']
+    server_ids:
+      - UC1ACCT-TEST01
     state: absent
 '''
 
diff --git a/cloud/lxd/lxd_profile.py b/cloud/lxd/lxd_profile.py
index 272a88b1..831765bf 100644
--- a/cloud/lxd/lxd_profile.py
+++ b/cloud/lxd/lxd_profile.py
@@ -105,7 +105,7 @@ EXAMPLES = '''
         name: macvlan
         state: present
         config: {}
-        description: 'my macvlan profile'
+        description: my macvlan profile
         devices:
           eth0:
             nictype: macvlan
@@ -126,7 +126,7 @@ EXAMPLES = '''
       name: macvlan
       state: present
       config: {}
-      description: 'my macvlan profile'
+      description: my macvlan profile
       devices:
         eth0:
           nictype: macvlan