From f8b989755cc7c6c912a6807db4131389d31c9af9 Mon Sep 17 00:00:00 2001 From: Fabio Alessandro Locati Date: Fri, 2 Dec 2016 15:39:15 +0000 Subject: Unquote urls in YAML - cloud (#5797) --- cloud/amazon/cloudformation.py | 4 ++-- cloud/openstack/_glance_image.py | 4 ++-- cloud/openstack/_keystone_user.py | 2 +- cloud/openstack/_nova_compute.py | 2 +- cloud/openstack/_nova_keypair.py | 2 +- cloud/openstack/_quantum_floating_ip.py | 2 +- cloud/openstack/_quantum_floating_ip_associate.py | 2 +- cloud/openstack/_quantum_network.py | 2 +- cloud/openstack/_quantum_router.py | 2 +- cloud/openstack/_quantum_router_gateway.py | 2 +- cloud/openstack/_quantum_subnet.py | 2 +- cloud/openstack/os_image_facts.py | 2 +- cloud/openstack/os_networks_facts.py | 6 +++--- cloud/openstack/os_server.py | 10 +++++----- cloud/openstack/os_subnets_facts.py | 6 +++--- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/cloud/amazon/cloudformation.py b/cloud/amazon/cloudformation.py index 2cf26785..bdc15613 100644 --- a/cloud/amazon/cloudformation.py +++ b/cloud/amazon/cloudformation.py @@ -147,7 +147,7 @@ EXAMPLES = ''' state: present region: us-east-1 disable_rollback: true - template_url: 'https://s3.amazonaws.com/my-bucket/cloudformation.template' + template_url: https://s3.amazonaws.com/my-bucket/cloudformation.template args: template_parameters: KeyName: jmartin @@ -164,7 +164,7 @@ EXAMPLES = ''' state: present region: us-east-1 disable_rollback: true - template_url: 'https://s3.amazonaws.com/my-bucket/cloudformation.template' + template_url: https://s3.amazonaws.com/my-bucket/cloudformation.template role_arn: 'arn:aws:iam::123456789012:role/cloudformation-iam-role' args: template_parameters: diff --git a/cloud/openstack/_glance_image.py b/cloud/openstack/_glance_image.py index 2d3c9583..bc113b09 100644 --- a/cloud/openstack/_glance_image.py +++ b/cloud/openstack/_glance_image.py @@ -44,7 +44,7 @@ options: description: - The keystone url for authentication required: false - default: 'http://127.0.0.1:35357/v2.0/' + default: http://127.0.0.1:35357/v2.0/ region_name: description: - Name of the region @@ -129,7 +129,7 @@ EXAMPLES = ''' container_format: bare disk_format: qcow2 state: present - copy_from: 'http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img' + copy_from: http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img ''' import time diff --git a/cloud/openstack/_keystone_user.py b/cloud/openstack/_keystone_user.py index 430e8bf4..72bf4dcf 100644 --- a/cloud/openstack/_keystone_user.py +++ b/cloud/openstack/_keystone_user.py @@ -51,7 +51,7 @@ options: description: - The keystone url for authentication required: false - default: 'http://127.0.0.1:35357/v2.0/' + default: http://127.0.0.1:35357/v2.0/ user: description: - The name of the user that has to added/removed from OpenStack diff --git a/cloud/openstack/_nova_compute.py b/cloud/openstack/_nova_compute.py index 29d3ab04..634e8474 100644 --- a/cloud/openstack/_nova_compute.py +++ b/cloud/openstack/_nova_compute.py @@ -58,7 +58,7 @@ options: description: - The keystone url for authentication required: false - default: 'http://127.0.0.1:35357/v2.0/' + default: http://127.0.0.1:35357/v2.0/ region_name: description: - Name of the region diff --git a/cloud/openstack/_nova_keypair.py b/cloud/openstack/_nova_keypair.py index 587bb5dc..cabe35ea 100644 --- a/cloud/openstack/_nova_keypair.py +++ b/cloud/openstack/_nova_keypair.py @@ -56,7 +56,7 @@ options: description: - The keystone url for authentication required: false - default: 'http://127.0.0.1:35357/v2.0/' + default: http://127.0.0.1:35357/v2.0/ region_name: description: - Name of the region diff --git a/cloud/openstack/_quantum_floating_ip.py b/cloud/openstack/_quantum_floating_ip.py index d3e2c898..f89f632e 100644 --- a/cloud/openstack/_quantum_floating_ip.py +++ b/cloud/openstack/_quantum_floating_ip.py @@ -60,7 +60,7 @@ options: description: - The keystone url for authentication required: false - default: 'http://127.0.0.1:35357/v2.0/' + default: http://127.0.0.1:35357/v2.0/ region_name: description: - Name of the region diff --git a/cloud/openstack/_quantum_floating_ip_associate.py b/cloud/openstack/_quantum_floating_ip_associate.py index 7c7d7045..3a87af9c 100644 --- a/cloud/openstack/_quantum_floating_ip_associate.py +++ b/cloud/openstack/_quantum_floating_ip_associate.py @@ -57,7 +57,7 @@ options: description: - the keystone url for authentication required: false - default: 'http://127.0.0.1:35357/v2.0/' + default: http://127.0.0.1:35357/v2.0/ region_name: description: - name of the region diff --git a/cloud/openstack/_quantum_network.py b/cloud/openstack/_quantum_network.py index a6cf688e..1e62e561 100644 --- a/cloud/openstack/_quantum_network.py +++ b/cloud/openstack/_quantum_network.py @@ -59,7 +59,7 @@ options: description: - The keystone url for authentication required: false - default: 'http://127.0.0.1:35357/v2.0/' + default: http://127.0.0.1:35357/v2.0/ region_name: description: - Name of the region diff --git a/cloud/openstack/_quantum_router.py b/cloud/openstack/_quantum_router.py index 3a12028d..619a4cf8 100644 --- a/cloud/openstack/_quantum_router.py +++ b/cloud/openstack/_quantum_router.py @@ -55,7 +55,7 @@ options: description: - The keystone url for authentication required: false - default: 'http://127.0.0.1:35357/v2.0/' + default: http://127.0.0.1:35357/v2.0/ region_name: description: - Name of the region diff --git a/cloud/openstack/_quantum_router_gateway.py b/cloud/openstack/_quantum_router_gateway.py index e71a1717..6cdc4424 100644 --- a/cloud/openstack/_quantum_router_gateway.py +++ b/cloud/openstack/_quantum_router_gateway.py @@ -55,7 +55,7 @@ options: description: - The keystone URL for authentication required: false - default: 'http://127.0.0.1:35357/v2.0/' + default: http://127.0.0.1:35357/v2.0/ region_name: description: - Name of the region diff --git a/cloud/openstack/_quantum_subnet.py b/cloud/openstack/_quantum_subnet.py index 8e6dee2c..57349558 100644 --- a/cloud/openstack/_quantum_subnet.py +++ b/cloud/openstack/_quantum_subnet.py @@ -54,7 +54,7 @@ options: description: - The keystone URL for authentication required: false - default: 'http://127.0.0.1:35357/v2.0/' + default: http://127.0.0.1:35357/v2.0/ region_name: description: - Name of the region diff --git a/cloud/openstack/os_image_facts.py b/cloud/openstack/os_image_facts.py index 9f693c73..9fe906da 100644 --- a/cloud/openstack/os_image_facts.py +++ b/cloud/openstack/os_image_facts.py @@ -45,7 +45,7 @@ EXAMPLES = ''' - name: Gather facts about a previously created image named image1 os_image_facts: auth: - auth_url: 'https://your_api_url.com:9000/v2.0' + auth_url: https://your_api_url.com:9000/v2.0 username: user password: password project_name: someproject diff --git a/cloud/openstack/os_networks_facts.py b/cloud/openstack/os_networks_facts.py index c261fc32..6eb73f92 100644 --- a/cloud/openstack/os_networks_facts.py +++ b/cloud/openstack/os_networks_facts.py @@ -49,7 +49,7 @@ EXAMPLES = ''' - name: Gather facts about previously created networks os_networks_facts: auth: - auth_url: 'https://your_api_url.com:9000/v2.0' + auth_url: https://your_api_url.com:9000/v2.0 username: user password: password project_name: someproject @@ -61,7 +61,7 @@ EXAMPLES = ''' - name: Gather facts about a previously created network by name os_networks_facts: auth: - auth_url: 'https://your_api_url.com:9000/v2.0' + auth_url: https://your_api_url.com:9000/v2.0 username: user password: password project_name: someproject @@ -75,7 +75,7 @@ EXAMPLES = ''' # Note: name and filters parameters are Not mutually exclusive os_networks_facts: auth: - auth_url: 'https://your_api_url.com:9000/v2.0' + auth_url: https://your_api_url.com:9000/v2.0 username: user password: password project_name: someproject diff --git a/cloud/openstack/os_server.py b/cloud/openstack/os_server.py index f4d546d2..d6d74e1f 100644 --- a/cloud/openstack/os_server.py +++ b/cloud/openstack/os_server.py @@ -207,7 +207,7 @@ EXAMPLES = ''' os_server: state: present auth: - auth_url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0/' + auth_url: https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0/ username: admin password: admin project_name: admin @@ -232,7 +232,7 @@ EXAMPLES = ''' os_server: state: present auth: - auth_url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0/' + auth_url: https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0/ username: username password: Equality7-2521 project_name: username-project1 @@ -299,7 +299,7 @@ EXAMPLES = ''' - name: launch an instance with a string os_server: auth: - auth_url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0/' + auth_url: https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0/ username: admin password: admin project_name: admin @@ -314,7 +314,7 @@ EXAMPLES = ''' os_server: state: present auth: - auth_url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0/' + auth_url: https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0/ username: admin password: admin project_name: admin @@ -332,7 +332,7 @@ EXAMPLES = ''' os_server: state: present auth: - auth_url: 'https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0/' + auth_url: https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0/ username: admin password: admin project_name: admin diff --git a/cloud/openstack/os_subnets_facts.py b/cloud/openstack/os_subnets_facts.py index dce24362..3fe0b80e 100644 --- a/cloud/openstack/os_subnets_facts.py +++ b/cloud/openstack/os_subnets_facts.py @@ -49,7 +49,7 @@ EXAMPLES = ''' - name: Gather facts about previously created subnets os_subnets_facts: auth: - auth_url: 'https://your_api_url.com:9000/v2.0' + auth_url: https://your_api_url.com:9000/v2.0 username: user password: password project_name: someproject @@ -61,7 +61,7 @@ EXAMPLES = ''' - name: Gather facts about a previously created subnet by name os_subnets_facts: auth: - auth_url: 'https://your_api_url.com:9000/v2.0' + auth_url: https://your_api_url.com:9000/v2.0 username: user password: password project_name: someproject @@ -75,7 +75,7 @@ EXAMPLES = ''' # Note: name and filters parameters are not mutually exclusive os_subnets_facts: auth: - auth_url: 'https://your_api_url.com:9000/v2.0' + auth_url: https://your_api_url.com:9000/v2.0 username: user password: password project_name: someproject -- cgit v1.2.1