Skip to content

Commit

Permalink
Merge pull request #13 from Juniper/main
Browse files Browse the repository at this point in the history
Rebase 22.8
  • Loading branch information
aburston committed Sep 28, 2022
2 parents bcd353c + 6f9b0f4 commit ac6a357
Show file tree
Hide file tree
Showing 24 changed files with 11 additions and 476 deletions.
15 changes: 0 additions & 15 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,6 @@ git clone <repo_url>

# Package Build

## Debian/Ubuntu Package

To generate a .deb package file for the instalation of the NITA Ansible on a Debian based system you can run the *build-ansible-21.7-1.sh* script file found under the *packaging* folder:
```bash
cd packaging
./build-ansible-21.7-1.sh
```

## Centos/RedHat Package
To generate a .rpm package file for the instalation of the NITA Ansible on a Centos based system you can run the *build-ansible-21.7-1.sh* script file found under the *packaging_redhat* folder:
```bash
cd packaging_redhat
./build-ansible-21.7-1.sh
```

# Docker Image Build
To build the ansible docker image you can simply run the *build_container.sh* also found on the root folder of this repo:
```bash
Expand Down
30 changes: 5 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# NITA Ansible 21.7
# NITA Ansible 22.8

Welcome to NITA 21.7.
Welcome to NITA 22.8.

Packages built from this branch will be nita-*-21.7-x where x is the packaging release.
Packages built from this branch will be nita-*-22.8-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 21.7 is backward compatible with NITA 20.10 projects, provided the correct ansible and robot containers are installed.
Note that NITA 22.8 is backward compatible with NITA 21.7 projects, provided the correct ansible and robot containers are installed.

# Copyright

Expand Down Expand Up @@ -41,26 +41,6 @@ NITA depends on docker-ce and docker-compose.
* It is recommended to follow this steps after installing docker-ce: https://docs.docker.com/engine/install/linux-postinstall/
* To install **docker-compose** follow the instructions found here: https://docs.docker.com/compose/install/

## Installation

If you do not have the the required package files for your system, .deb for Ubuntu or .rpm for Centos refer to [BUILD.md](./BUILD.md) file for instructions on how to generate them.

### Ubuntu

If you have been provided with the .deb package file, then follow the instructions provided in the [Dependencies](##Dependencies) section above and then run the following command:

```bash
sudo apt-get install ./nita-ansible-2.9.18-21.7-1.deb
```

### Centos

If you have been provided with the .rpm package file, then follow the instructions provided in the [Dependencies](##Dependencies) section above and then run the following command:


```bash
sudo yum install ./nita-ansible-2.9.18-21.7-1.noarch.rpm
```
# Using nita-ansible

This container holds Ansible executables, related libraries, and files for managing Juniper devices using Ansible. The NITA framework uses the nita-ansible container to run ansible playbooks included with the framework. Nita-ansible can also be used as a standalone container for executing your own playbooks. Simply put your inventory file and playbooks into a project folder on the system hosting the container. You will also want to put a bash script to execute the ```ansible-playbook``` command.
Expand Down Expand Up @@ -279,4 +259,4 @@ More complex examples of project folders can be found in the larger NITA project

# Misc

For more information on NITA releases refer to the [README.md](https://github.com/Juniper/nita-webapp/blob/21.7/README.md) for the NITA Webapp.
For more information on NITA releases refer to the [README.md](https://github.com/Juniper/nita-webapp/blob/22.8/README.md) for the NITA Webapp.
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
21.7
22.8
2 changes: 1 addition & 1 deletion build_container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
#
# ********************************************************

docker build -t juniper/nita-ansible:21.7-1 .
docker build -t juniper/nita-ansible:22.8-1 .
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# ********************************************************
if [ "$_CLI_RUNNER_DEBUG" == 1 ]; then
echo `cat <<EOT
docker run -e PS1="\u@\h:\w# " -it --rm --name ansible -u root -v /var/nita_project:/project:rw -v /var/nita_configs:/var/tmp/build:rw juniper/nita-ansible:21.7-1 /bin/bash
docker run -e PS1="\u@\h:\w# " -it --rm --name ansible -u root -v /var/nita_project:/project:rw -v /var/nita_configs:/var/tmp/build:rw juniper/nita-ansible:22.8-1 /bin/bash
EOT` >&2
fi
docker run -e PS1="\u@\h:\w# " -it --rm --name ansible -u root -v /var/nita_project:/project:rw -v /var/nita_configs:/var/tmp/build:rw juniper/nita-ansible:21.7-1 /bin/bash
docker run -e PS1="\u@\h:\w# " -it --rm --name ansible -u root -v /var/nita_project:/project:rw -v /var/nita_configs:/var/tmp/build:rw juniper/nita-ansible:22.8-1 /bin/bash
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# Third-Party Code: This code may depend on other components under separate copyright notice and license terms. Your use of the source code for those components is subject to the terms and conditions of the respective license as noted in the Third-Party source code file.
#
# ********************************************************
echo -n " nita-cmd ansible cli 21.7 => "
echo -n " nita-cmd ansible cli 22.8 => "
echo `cat <<EOT
Starts an ansible container (version 21.7) command line shell interface in the /project directory.
Starts an ansible container (version 22.8) command line shell interface in the /project directory.
EOT` >&2
3 changes: 0 additions & 3 deletions packaging/.gitignore

This file was deleted.

68 changes: 0 additions & 68 deletions packaging/build-ansible-21.7-1.sh

This file was deleted.

9 changes: 0 additions & 9 deletions packaging/nita-ansible-2.9.18-21.7-1/DEBIAN/control

This file was deleted.

3 changes: 0 additions & 3 deletions packaging/nita-ansible-2.9.18-21.7-1/DEBIAN/postinst

This file was deleted.

3 changes: 0 additions & 3 deletions packaging/nita-ansible-2.9.18-21.7-1/DEBIAN/prerm

This file was deleted.

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions packaging_redhat/.rpmmacros

This file was deleted.

76 changes: 0 additions & 76 deletions packaging_redhat/build-ansible-21.7-1.sh

This file was deleted.

2 changes: 0 additions & 2 deletions packaging_redhat/nita-ansible-2.9.18-21.7-1/BUILD/.gitignore

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions packaging_redhat/nita-ansible-2.9.18-21.7-1/RPMS/.gitignore

This file was deleted.

This file was deleted.

0 comments on commit ac6a357

Please sign in to comment.