Use main.yml for common variables and consolidate redhat_6/7 to redhat.yml

amanda11 · amanda11 · commit b6a35f74a3aa · 2020-06-29T13:10:50.000Z
diff --git a/roles/StackStorm.mongodb/vars/debian.yml b/roles/StackStorm.mongodb/vars/debian.yml
@@ -1,5 +1,3 @@
-# Extract mongodb "major.minor" version
-mongodb_major_minor_version: "{{ (mongodb_version|string)[:3] }}"
 # Use the following URL to find the key: https://www.mongodb.org/static/pgp/server-{{ mongodb_major_minor_version }}.asc
 mongodb_apt_keys:
   "3.2": "42F3E95A2C4F08279C4960ADD68FA50FEA312927"
diff --git a/roles/StackStorm.mongodb/vars/main.yml b/roles/StackStorm.mongodb/vars/main.yml
@@ -0,0 +1,2 @@
+# Extract mongodb "major.minor" version
+mongodb_major_minor_version: "{{ (mongodb_version|string)[:3] }}"
diff --git a/roles/StackStorm.mongodb/vars/redhat.yml b/roles/StackStorm.mongodb/vars/redhat.yml
@@ -3,5 +3,3 @@ mongo_dependencies:
       - pyOpenSSL
       - python-pyasn1
       - python-ndg_httpsclient
-# Extract mongodb "major.minor" version
-mongodb_major_minor_version: "{{ (mongodb_version|string)[:3] }}"
diff --git a/roles/StackStorm.mongodb/vars/redhat_7.yml b/roles/StackStorm.mongodb/vars/redhat_7.yml
diff --git a/roles/StackStorm.mongodb/vars/redhat_8.yml b/roles/StackStorm.mongodb/vars/redhat_8.yml
@@ -2,5 +2,3 @@ mongo_dependencies:
       - python3-urllib3
       - python3-pyOpenSSL
       - python3-pyasn1
-# Extract mongodb "major.minor" version
-mongodb_major_minor_version: "{{ (mongodb_version|string)[:3] }}"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# Extract mongodb "major.minor" version`
`2`		`-mongodb_major_minor_version: "{{ (mongodb_version\|string)[:3] }}"`
`3`	`1`	`# Use the following URL to find the key: https://www.mongodb.org/static/pgp/server-{{ mongodb_major_minor_version }}.asc`
`4`	`2`	`mongodb_apt_keys:`
`5`	`3`	`"3.2": "42F3E95A2C4F08279C4960ADD68FA50FEA312927"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Extract mongodb "major.minor" version`
	`2`	`+mongodb_major_minor_version: "{{ (mongodb_version\|string)[:3] }}"`