From db0bd471c3dea0c620e80a235d8c9cf9013f8830 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Tue, 1 Oct 2019 13:45:07 -0400
Subject: [PATCH] rename playbook vars to have collection_

---
 Makefile                           |  6 +++---
 awx_collection/galaxy.yml.j2       |  6 +++---
 awx_collection/template_galaxy.yml | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index c0ada60b61..981dea2484 100644
--- a/Makefile
+++ b/Makefile
@@ -383,8 +383,8 @@ prepare_collection_venv:
 	$(VENV_BASE)/awx/bin/pip install --target=$(COLLECTION_VENV) git+https://github.com/ansible/tower-cli.git
 
 COLLECTION_TEST_DIRS ?= awx_collection/test/awx
-COLLECTION_PACKAGE_NAME ?= awx
-COLLECTION_NAMESPACE_NAME ?= awx
+COLLECTION_PACKAGE ?= awx
+COLLECTION_NAMESPACE ?= awx
 
 test_collection:
 	@if [ "$(VENV_BASE)" ]; then \
@@ -398,7 +398,7 @@ flake8_collection:
 test_collection_all: prepare_collection_venv test_collection flake8_collection
 
 build_collection:
-	ansible-playbook -i localhost, awx_collection/template_galaxy.yml -e package_name=$(COLLECTION_PACKAGE_NAME) -e namespace_name=$(COLLECTION_NAMESPACE_NAME) -e package_version=$(VERSION)
+	ansible-playbook -i localhost, awx_collection/template_galaxy.yml -e collection_package=$(COLLECTION_PACKAGE) -e namespace_name=$(COLLECTION_NAMESPACE) -e package_version=$(VERSION)
 	ansible-galaxy collection build awx_collection --output-path=awx_collection
 
 test_unit:
diff --git a/awx_collection/galaxy.yml.j2 b/awx_collection/galaxy.yml.j2
index 588d6438ba..c573edc709 100644
--- a/awx_collection/galaxy.yml.j2
+++ b/awx_collection/galaxy.yml.j2
@@ -8,9 +8,9 @@ homepage: https://ansible.com
 issues: https://github.com/ansible/awx/issues
 license:
 - GPL-3.0-only
-name: {{ package_name }}
-namespace: {{ namespace_name }}
+name: {{ collection_package }}
+namespace: {{ collection_namespace }}
 readme: README.md
 repository: https://github.com/ansible/awx
 tags: []
-version: {{ package_version }}
+version: {{ collection_version }}
diff --git a/awx_collection/template_galaxy.yml b/awx_collection/template_galaxy.yml
index e7f57d1074..bfbea58bf7 100644
--- a/awx_collection/template_galaxy.yml
+++ b/awx_collection/template_galaxy.yml
@@ -2,9 +2,9 @@
   gather_facts: false
   connection: local
   vars:
-    package_name: awx
-    namespace_name: awx
-    package_version: 0.0.1
+    collection_package: awx
+    collection_namespace: awx
+    collection_version: 0.0.1  # not for updating, pass in extra_vars
 
   tasks:
   - name: Do file content replacements for non-default namespace or package name
@@ -19,10 +19,10 @@
       replace:
         path: "{{ item.path }}"
         regexp: '^extends_documentation_fragment: awx.awx.auth$'
-        replace: 'extends_documentation_fragment: {{ namespace_name }}.{{ package_name }}.auth'
+        replace: 'extends_documentation_fragment: {{ collection_namespace }}.{{ collection_package }}.auth'
       with_items: "{{ module_files.files }}"
     when:
-      - (package_name != 'awx') or (namespace_name != 'awx')
+      - (collection_package != 'awx') or (collection_namespace != 'awx')
 
   - name: Template the galaxy.yml file
     template: src={{ playbook_dir }}/galaxy.yml.j2 dest={{ playbook_dir }}/galaxy.yml