Merge pull request #131 from ericcames/ericames/productdemo

Ericames/productdemo

Author: ericcames

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+ames@redhat.com.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

README.md

@@ -83,18 +83,17 @@ Looking for other Daily Demos?
 ![alt text](https://github.com/ericcames/aap.as.code/blob/main/images/snowshort.png "ServiceNow Catalog Item")
 
 11. Create your job template
-![alt text](https://github.com/ericcames/aap.as.code/blob/main/images/newtemplate.png "Setup - AAP - CAC")
 
 Template name
 ```
 Setup - AAP - CAC
 ```
 
+![alt text](https://github.com/ericcames/aap.as.code/blob/main/images/setup_template.png "Setup - AAP - CAC")
+
 Extra variables
 ```
 my_windows_catalog_short_description: Ames AAP Windows AWS Daily Demo
-my_aap_url: "GETTHISFROMAPD"
-my_ctrl_admin_password: "GETTHISFROMAPD"
 my_vault: Eric Ames
 my_remote_vault: >-
   https://raw.githubusercontent.com/ericcames/sourcefiles/refs/heads/main/vault_ames.yml

images/newtemplate.png

@@ -5,8 +5,8 @@ eda_credentials:
     credential_type: 'Red Hat Ansible Automation Platform'
     organization: "{{ my_organization }}"
     inputs:
-      host: "{{ my_aap_url }}/api/controller/"
-      password: "{{ my_ctrl_admin_password }}"
+      host: "{{ aap_hostname }}/api/controller/"
+      password: "{{ aap_password }}"
       username: "admin"
       verify_ssl: true
 

images/setup_template.png

@@ -3,7 +3,7 @@ gateway_settings:
   gateway_token_name: X-DAB-JW-TOKEN
   gateway_access_token_expiration: 600
   gateway_basic_auth_enabled: true
-  gateway_proxy_url: "{{ my_aap_url }}"
+  gateway_proxy_url: "{{ aap_hostname }}"
   gateway_proxy_url_ignore_cert: false
   password_min_length: 0
   password_min_digits: 0

playbooks/files/config_as_code/eda_credentials.yml

@@ -4,26 +4,13 @@
   vars:
     ansible_python_interpreter: /usr/bin/python3
     my_organization: "IT Service Automation"
-    my_aap_url: ""
     my_aap_credential: "AAP Credential"
     my_remote_vault: ""
     aap_configuration_async_retries: 60
     aap_configuration_async_delay: 2
     controller_configuration_settings_secure_logging: true
     my_vault: ""
     timezone_id: America/Phoenix
-    github_username: ""
-
-
-    # There is a bug in the infra.aap_configuration that causes the need for thing
-    # When bug https://issues.redhat.com/browse/AAP-39349 this section can go away
-    # We will need to uncomment the token sections below
-    # Mapping red hat automation platform controller credential to infra.aap_configuration collection
-    aap_hostname: "{{ lookup('ansible.builtin.env', 'CONTROLLER_HOST') }}"
-    aap_username: "{{ lookup('ansible.builtin.env', 'CONTROLLER_USERNAME') }}"
-    aap_password: "{{ lookup('ansible.builtin.env', 'CONTROLLER_PASSWORD') }}"
-    aap_validate_certs: "{{ lookup('ansible.builtin.env', 'CONTROLLER_VERIFY_SSL') }}"
-    aap_token: "{{ lookup('ansible.builtin.env', 'CONTROLLER_OAUTH_TOKEN') }}"
 
   tasks:
 
@@ -38,15 +25,15 @@
           - "Red Hat Ansible Automation Platform credential is not set"
           - "Please assign correct credentials to the Job Template"
 
-    # - name: Create a new token
-    #   ansible.platform.token:
-    #     aap_hostname: "{{ lookup('ansible.builtin.env', 'CONTROLLER_HOST') }}"
-    #     aap_username: "{{ lookup('ansible.builtin.env', 'CONTROLLER_USERNAME') }}"
-    #     aap_password: "{{ lookup('ansible.builtin.env', 'CONTROLLER_PASSWORD') }}"
-    #     aap_validate_certs: false
-    #     description: AAP Setup
-    #     scope: write
-    #     state: present
+    - name: Create a new token
+      ansible.platform.token:
+        aap_hostname: "{{ lookup('ansible.builtin.env', 'CONTROLLER_HOST') }}"
+        aap_username: "{{ lookup('ansible.builtin.env', 'CONTROLLER_USERNAME') }}"
+        aap_password: "{{ lookup('ansible.builtin.env', 'CONTROLLER_PASSWORD') }}"
+        aap_validate_certs: false
+        description: AAP Setup
+        scope: write
+        state: present
 
     - name: Grab vault from remote url
       ansible.builtin.get_url:
@@ -64,10 +51,10 @@
       ansible.builtin.include_role:
         name: infra.aap_configuration.dispatch
 
-    # - name: Remove my token
-    #   ansible.platform.token:
-    #     aap_hostname: "{{ lookup('ansible.builtin.env', 'CONTROLLER_HOST') }}"
-    #     existing_token: "{{ aap_token }}"
-    #     aap_token: "{{ aap_token['token'] }}"
-    #     aap_validate_certs: false
-    #     state: absent
+    - name: Remove my token
+      ansible.platform.token:
+        aap_hostname: "{{ lookup('ansible.builtin.env', 'CONTROLLER_HOST') }}"
+        existing_token: "{{ ansible_facts['aap_token'] }}"
+        aap_token: "{{ ansible_facts['aap_token']['token'] }}"
+        aap_validate_certs: false
+        state: absent