Allow RabbitMQ/Erlang repo overrides without extra-vars

It may be required to override the repo information
in its entirety, rather than just the URL. This
patch allows that to be done.

Change-Id: Ib49c057465a2a7e394a830a33a03ad9de3150899

defaults/main.yml

@@ -40,9 +40,19 @@ rabbitmq_package_sha256: "{{ _rabbitmq_package_sha256 }}"
 rabbitmq_package_path: "{{ _rabbitmq_package_path }}"
 
 rabbitmq_gpg_keys: "{{ _rabbitmq_gpg_keys }}"
+
+# Set the URL for the RabbitMQ repository
 rabbitmq_repo_url: "{{ _rabbitmq_repo_url }}"
+
+# Set the repo information for the RabbitMQ repository
+rabbitmq_repo: "{{ _rabbitmq_repo }}"
+
+# Set the URL for the Erlang repository
 rabbitmq_erlang_repo_url: "{{ _rabbitmq_erlang_repo_url }}"
 
+# Set the repo information for the Erlang repository
+rabbitmq_erlang_repo: "{{ _rabbitmq_erlang_repo }}"
+
 # Choose file, distro, external_repo for rabbitmq_install_method.
 rabbitmq_install_method: "file"
 

vars/debian.yml

@@ -30,13 +30,13 @@ _rabbitmq_gpg_keys:
     hash_id: '0xd208507ca14f4fca'
 
 _rabbitmq_repo_url: "http://www.rabbitmq.com/debian"
-rabbitmq_repo:
+_rabbitmq_repo:
   repo: "deb {{ rabbitmq_repo_url }} testing main"
   state: "present"
   filename: "RabbitMQ"
 
 _rabbitmq_erlang_repo_url: "https://packages.erlang-solutions.com/{{ ansible_distribution | lower }}"
-rabbitmq_erlang_repo:
+_rabbitmq_erlang_repo:
   repo: "deb {{ rabbitmq_erlang_repo_url }} {{ ansible_distribution_release | lower }} contrib"
   state: "present"
   filename: els_erlang

vars/redhat.yml

@@ -26,7 +26,7 @@ _rabbitmq_gpg_keys:
     keyserver: 'https://packages.erlang-solutions.com/ubuntu'
 
 _rabbitmq_repo_url: "https://packagecloud.io/rabbitmq/rabbitmq-server/el/7/$basearch"
-rabbitmq_repo:
+_rabbitmq_repo:
   name: rabbitmq_rabbitmq-server
   description: "RabbitMQ Server Rolling Repository"
   baseurl: "{{ rabbitmq_repo_url }}"
@@ -39,7 +39,7 @@ rabbitmq_repo:
   #sslcacert: /etc/pki/tls/certs/ca-bundle.crt
 
 _rabbitmq_erlang_repo_url: "https://packages.erlang-solutions.com/rpm/centos/$releasever/$basearch"
-rabbitmq_erlang_repo:
+_rabbitmq_erlang_repo:
   name: rabbitmq_els-erlang
   description: "Erlang Solutions Erlang"
   baseurl: "{{ rabbitmq_erlang_repo_url }}"