Merge pull request #7 from RedHatSatellite/update101

Update to 1.0.1
RedHatSatellite · Jun 30, 2020 · c4b7ba9 · c4b7ba9
2 parents d3b2cf5 + b2a5d2b
commit c4b7ba9
Show file tree

Hide file tree

Showing 54 changed files with 148 additions and 354 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/Makefile b/Makefile
@@ -114,6 +114,7 @@ doc: $(MANIFEST)
 
 branding:
 	sed -i 's/theforeman\.foreman/redhat.satellite/g' plugins/*/*.py tests/inventory/tests.foreman.yml tests/test_module_state.py tests/test_playbooks/*.yml
+	sed -i 's/foreman.example.com/satellite.example.com/g' plugins/*/*.py
 
 FORCE:
 

diff --git a/galaxy.yml b/galaxy.yml
@@ -49,7 +49,7 @@ authors:
   - "metalcated <[email protected]>"
   - "russianguppie <[email protected]>"
   - "willtome <[email protected]>"
-version: "1.0.0"
+version: "1.0.1"
 license:
   - "GPL-3.0-or-later"
 tags:

diff --git a/plugins/filter/foreman.py b/plugins/filter/foreman.py
@@ -6,13 +6,6 @@
 __metaclass__ = type
 
 
-ANSIBLE_METADATA = {
-    'metadata_version': '1.1',
-    'status': ['preview'],
-    'supported_by': 'community'
-}
-
-
 import re
 
 

diff --git a/plugins/modules/activation_key.py b/plugins/modules/activation_key.py
@@ -19,10 +19,6 @@
 __metaclass__ = type
 
 
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
 DOCUMENTATION = '''
 ---
 module: activation_key
@@ -152,7 +148,7 @@
   activation_key:
     username: "admin"
     password: "changeme"
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     name: "Clients"
     organization: "Default Organization"
     lifecycle_environment: "Library"

diff --git a/plugins/modules/architecture.py b/plugins/modules/architecture.py
@@ -19,10 +19,6 @@
 __metaclass__ = type
 
 
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
 DOCUMENTATION = '''
 ---
 module: architecture
@@ -56,7 +52,7 @@
     operatingsystems:
       - "TestOS1"
       - "TestOS2"
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     username: "admin"
     password: "secret"
     state: present
@@ -67,15 +63,15 @@
     operatingsystems:
       - "TestOS3"
       - "TestOS4"
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     username: "admin"
     password: "secret"
     state: present
 
 - name: "Delete an Architecture"
   architecture:
     name: "i386"
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     username: "admin"
     password: "secret"
     state: absent

diff --git a/plugins/modules/auth_source_ldap.py b/plugins/modules/auth_source_ldap.py
@@ -19,10 +19,6 @@
 __metaclass__ = type
 
 
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
 DOCUMENTATION = '''
 ---
 module: auth_source_ldap
@@ -128,7 +124,7 @@
   auth_source_ldap:
     name: "Example LDAP"
     host: "ldap.example.org"
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     locations:
       - "Uppsala"
     organizations:
@@ -152,7 +148,7 @@
     attr_lastname: sn
     attr_mail: mail
     attr_photo: jpegPhoto
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     username: "admin"
     password: "secret"
     state: present

diff --git a/plugins/modules/bookmark.py b/plugins/modules/bookmark.py
@@ -19,10 +19,6 @@
 __metaclass__ = type
 
 
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
 DOCUMENTATION = '''
 ---
 module: bookmark
@@ -63,7 +59,7 @@
   bookmark:
     username: "admin"
     password: "changeme"
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     name: "recent"
     controller: "job_invocations"
     query: "started_at > '24 hours ago'"
@@ -73,7 +69,7 @@
   bookmark:
     username: "admin"
     password: "changeme"
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     name: "recent"
     controller: "job_invocations"
     query: "started_at > '12 hours ago'"
@@ -83,7 +79,7 @@
   bookmark:
     username: "admin"
     password: "changeme"
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     name: "recent"
     controller: "job_invocations"
     state: absent

diff --git a/plugins/modules/compute_attribute.py b/plugins/modules/compute_attribute.py
@@ -19,10 +19,6 @@
 __metaclass__ = type
 
 
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
 DOCUMENTATION = '''
 ---
 module: compute_attribute
@@ -60,7 +56,7 @@
   compute_attribute:
     username: "admin"
     password: "changeme"
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     compute_profile: "Test Compute Profile"
     compute_resource: "Test Compute Resource"
     vm_attrs:
@@ -72,7 +68,7 @@
   compute_attribute:
     username: "admin"
     password: "changeme"
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     compute_profile: "Test Compute Profile"
     compute_resource: "Test Compute Resource"
     vm_attrs:

diff --git a/plugins/modules/compute_profile.py b/plugins/modules/compute_profile.py
@@ -20,10 +20,6 @@
 __metaclass__ = type
 
 
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
 DOCUMENTATION = '''
 ---
 module: compute_profile
@@ -67,7 +63,7 @@
 - name: compute profile
   compute_profile:
     name: example_compute_profile
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     username: admin
     password: secret
     state: present
@@ -81,7 +77,7 @@
         cluster: 'a96d44a4-f14a-1015-82c6-f80354acdf01'
         template: 'c88af4b7-a24a-453b-9ac2-bc647ca2ef99'
         instance_type: 'cb8927e7-a404-40fb-a6c1-06cbfc92e077'
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     username: admin
     password: secret
     state: present
@@ -125,15 +121,15 @@
             capacity: 16G
             allocation: 16G
             format_type: raw
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     username: admin
     password: secret
     state: present
 
 - name: Remove compute profile
   compute_profile:
     name: example_compute_profile2
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     username: admin
     password: secret
     state: absent

diff --git a/plugins/modules/compute_resource.py b/plugins/modules/compute_resource.py
@@ -21,10 +21,6 @@
 __metaclass__ = type
 
 
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
 DOCUMENTATION = '''
 ---
 module: compute_resource
@@ -137,7 +133,7 @@
     provider_params:
       url: libvirt.example.com
       display_type: vnc
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     username: admin
     password: secret
     state: present
@@ -154,15 +150,15 @@
     provider_params:
       url: libvirt.example.com
       display_type: vnc
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     username: admin
     password: secret
     state: present
 
 - name: Delete libvirt compute resource
   compute_resource:
     name: example_compute_resource
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     username: admin
     password: secret
     state: absent
@@ -180,7 +176,7 @@
       user: admin
       password: secret
       datacenter: ax01
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     username: admin
     password: secret
     state: present
@@ -200,7 +196,7 @@
       datacenter: aa92fb54-0736-4066-8fa8-b8b9e3bd75ac
       ovirt_quota: 24868ab9-c2a1-47c3-87e7-706f17d215ac
       use_v4: true
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     username: admin
     password: secret
     state: present
@@ -218,7 +214,7 @@
       user: root@pam
       password: secretpassword
       ssl_verify_peer: true
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     username: admin
     password: secret
     state: present
@@ -236,7 +232,7 @@
       user: AWS_ACCESS_KEY
       password: AWS_SECRET_KEY
       region: eu-west-1
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     username: admin
     password: secret
     state: present
@@ -256,7 +252,7 @@
       app_ident: CLIENT_ID
       password: CLIENT_SECRET
       region: westeurope
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     username: admin
     password: secret
     state: present
@@ -275,7 +271,7 @@
       email: [email protected]
       key_path: "/usr/share/foreman/gce_orcharhino_key.json"
       zone: europe-west3-b
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     username: admin
     password: secret
     state: present

diff --git a/plugins/modules/config_group.py b/plugins/modules/config_group.py
@@ -19,10 +19,6 @@
 __metaclass__ = type
 
 
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
 DOCUMENTATION = '''
 ---
 module: config_group
@@ -56,7 +52,7 @@
     puppetclasses:
       - ntp
       - mymodule::myclass
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     username: "admin"
     password: "secret"
     state: present

diff --git a/plugins/modules/content_credential.py b/plugins/modules/content_credential.py
@@ -19,10 +19,6 @@
 __metaclass__ = type
 
 
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
 DOCUMENTATION = '''
 ---
 module: content_credential
@@ -60,7 +56,7 @@
   content_credential:
     username: "admin"
     password: "changeme"
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     name: "RPM-GPG-KEY-my-repo"
     content_type: gpg_key
     organization: "Default Organization"

diff --git a/plugins/modules/content_upload.py b/plugins/modules/content_upload.py
@@ -20,10 +20,6 @@
 __metaclass__ = type
 
 
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
 DOCUMENTATION = '''
 ---
 module: content_upload
@@ -65,7 +61,7 @@
   content_upload:
     username: "admin"
     password: "changeme"
-    server_url: "https://foreman.example.com"
+    server_url: "https://satellite.example.com"
     src: "my.rpm"
     repository: "Build RPMs"
     product: "My Product"
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,6 +114,7 @@ doc: $(MANIFEST) @@
     branding:
     	sed -i 's/theforeman\.foreman/redhat.satellite/g' plugins/*/*.py tests/inventory/tests.foreman.yml tests/test_module_state.py tests/test_playbooks/*.yml
+    	sed -i 's/foreman.example.com/satellite.example.com/g' plugins/*/*.py
     FORCE:
@@ Expand Down @@