Merge branch 'main' into 22.8

README.md

@@ -1,12 +1,11 @@
-# NITA Ansible 23.p
+# NITA Ansible 22.8-2
 
-Welcome to NITA 23.p pre-release. This is a testing release that includes scripts for building ansible execution environment for use with AWX. The execution environment is based on the nita-ansible docker build. Also included is a script to install AWX. See the individual readme files under the ansible-ee and awx folders for more information.
+Welcome to NITA 22.8-2. This is an update release that includes scripts for building ansible execution environment for use with AWX. The execution environment is based on the nita-ansible docker build. Also included is a script to install AWX. See the individual readme files under the ansible-ee and awx folders for more information.
 
-Packages built from this branch will be nita-*-22.p-x where x is the packaging release.
 This branch also contains patches from other branches or minor modifications as required to support the stability and usability of the release.
 There are also some backwards compatibility packages here for ansible and robot that allow projects written for NITA 3.0.7 to work without having to make any changes.
 
-Note that NITA 23.p should be backward compatible with NITA 22.8 and 21.7 projects, provided the correct ansible and robot containers are installed. However, see the note below about ansible 2.10 changes.
+Note that NITA 22.8-2 should be backward compatible with NITA 22.8 and 21.7 projects, provided the correct ansible and robot containers are installed. However, see the note below about ansible 2.10 changes.
 
 # Copyright
 

ansible-ee/README.md

@@ -1,11 +1,6 @@
 <H1> AWX Execution Environment </H1>
 
-Files located in this directory are used to create ansible execution environment for AWX/Ansible Tower. the ```build-container.sh``` script calls ansible-builder, which needs to be installed using pip (see https://ansible-builder.readthedocs.io/en/stable/installation/). Ansible-builder requires python3.8 or later to execute. [Ansible](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html) and [Docker](https://docs.docker.com/engine/install/ubuntu/) also need to be installed.  You can also build the container directly by issuing the following commands:
-
-```
-cd context
-docker build  --tag "juniper/nita-ansible-ee:22.9" .
-```
+Files located in this directory are used to create ansible execution environment for AWX/Ansible Tower. the ```build-ee-container.sh``` script calls ansible-builder, which needs to be installed using pip (see https://ansible-builder.readthedocs.io/en/stable/installation/). Ansible-builder requires python3.8 or later to execute. [Ansible](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html) and [Docker](https://docs.docker.com/engine/install/ubuntu/) also need to be installed. 
 
 AWX requires ansible EEs to be pulled from a repository. For testing purposes you can setup a local repository. See the instructions at https://www.docker.com/blog/how-to-use-your-own-registry-2/. After building the container, you can add a local repository as follows:
 
@@ -24,14 +19,9 @@ After this simply define the localhost:5000/ansible-ee in your definition for an
 + The file ``bindep.txt`` and related configuration in ``nita-ansible-ee.yml`` are here for completeness. AWX documentation and some blogs indicated it is required although container seemed to build and operate fine without it.
 + This container is being tested against a version of the ebgp-wan example from the NITA project. Current files for the AWX test version can be found at  https://github.com/wildsubnet/awx-test. There are certain incompatiabilities between NITA environment and AWX need to be worked out (see todo list below)
 
-## To-Do
-
-See https://github.com/users/wildsubnet/projects/1 for current list. Issues can be found at https://github.com/wildsubnet/nita-awx/issues
-
-
 ## AWX Screenshots
 
-How the NITA example data is being loaded into AWX for testing (as of September 22, 2022).
+How the NITA example data is being loaded into AWX for testing.
 
 ### Template
 <img width="1255" alt="image" src="https://user-images.githubusercontent.com/6110061/236244860-1bf9d65b-f034-4d35-88c4-b904def590c1.png">

awx/README.md

@@ -1,6 +1,6 @@
 # nita-awx
 
-This is a work in progress and represents the files used to create an AWX instance running along side an existing NITA (docker based) install. This is being used to test the AWX execution environment. AWX requires kubernetes.
+This is being used to test the AWX execution environment. AWX requires kubernetes.
 
 ## Folders
 
@@ -21,6 +21,8 @@ kubectl get nodes
 kubectl version --short
 ```
 
+Note: k8s is less forgiving of implied storage requirements and may require additional storage setup for AWX to start properly.
+
 2. Install AWX using the provided script as show below. This does a few things in addition to pulling a specific version of AWX. The script creates a namespace in k8s called ```awx```. It also creates the pods required to run AWX and spins up a service running on default ports for AWX. 
 
 ```
@@ -54,5 +56,8 @@ kubectl delete serviceaccount awx-operator-controller-manager
 kubectl delete rolebinding awx-operator-awx-manager-rolebinding
 kubectl delete role awx-operator-awx-manager-role
 ```
-
+
+ ## To-do
+
+Need to update installer for k8s rather than k3s and still need integration between nita webapp and AWX.
 

build_ee_container.sh

@@ -15,4 +15,4 @@
 
 cd ansible-ee
 cp -R ../network-roles context/
-ansible-builder build --tag "juniper/nita-ansible-ee:23.6" --container-runtime docker -f nita-ansible-ee.yml
+ansible-builder build --tag "juniper/nita-ansible-ee:22.8-2" --container-runtime docker -f nita-ansible-ee.yml