Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/devel' into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
cgoveas committed Jun 20, 2022
2 parents 7b01144 + 9b61dba commit 6e9916e
Show file tree
Hide file tree
Showing 30 changed files with 1,790 additions and 44 deletions.
28 changes: 19 additions & 9 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,15 @@
"talk"
]
},
{
"login": "Khushboodholi",
"name": "Khushboodholi",
"avatar_url": "https://avatars.githubusercontent.com/u/12014935?v=4",
"profile": "https://github.com/Khushboodholi",
"contributions": [
"code"
]
},
{
"login": "araji",
"name": "araji",
Expand Down Expand Up @@ -397,15 +406,6 @@
"test"
]
},
{
"login": "Khushboodholi",
"name": "Khushboodholi",
"avatar_url": "https://avatars.githubusercontent.com/u/12014935?v=4",
"profile": "https://github.com/Khushboodholi",
"contributions": [
"code"
]
},
{
"login": "naresh3774",
"name": "Naresh Sharma",
Expand Down Expand Up @@ -471,6 +471,16 @@
"test",
"code"
]
},
{
"login": "shridhar-sharma",
"name": "shridhar-sharma",
"avatar_url": "https://avatars.githubusercontent.com/u/104621992?v=4",
"profile": "https://github.com/shridhar-sharma",
"contributions": [
"test",
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
3 changes: 2 additions & 1 deletion .metadata/omnia_version
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Omnia version devel
omnia_version: 1.3
omnia_installation_path: ""
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,44 +63,44 @@ Our thanks go to everyone who makes Omnia possible ([emoji key](https://allcontr
</tr>
<tr>
<td align="center"><a href="https://github.com/cgoveas"><img src="https://avatars.githubusercontent.com/u/88071888?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cassey Goveas</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=cgoveas" title="Documentation">📖</a> <a href="https://github.com/dellhpc/omnia/issues?q=author%3Acgoveas" title="Bug reports">🐛</a> <a href="#maintenance-cgoveas" title="Maintenance">🚧</a> <a href="#talk-cgoveas" title="Talks">📢</a></td>
<td align="center"><a href="https://github.com/Khushboodholi"><img src="https://avatars.githubusercontent.com/u/12014935?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Khushboodholi</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=Khushboodholi" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/araji"><img src="https://avatars.githubusercontent.com/u/216020?v=4?s=100" width="100px;" alt=""/><br /><sub><b>araji</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=araji" title="Code">💻</a></td>
<td align="center"><a href="https://mike.renf.ro/blog/"><img src="https://avatars.githubusercontent.com/u/1451881?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mike Renfro</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=mikerenfro" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/leereyno-asu"><img src="https://avatars.githubusercontent.com/u/81774548?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lee Reynolds</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=leereyno-asu" title="Code">💻</a> <a href="https://github.com/dellhpc/omnia/commits?author=leereyno-asu" title="Documentation">📖</a> <a href="#tutorial-leereyno-asu" title="Tutorials">✅</a></td>
<td align="center"><a href="https://github.com/blesson-james"><img src="https://avatars.githubusercontent.com/u/72782936?v=4?s=100" width="100px;" alt=""/><br /><sub><b>blesson-james</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=blesson-james" title="Code">💻</a> <a href="https://github.com/dellhpc/omnia/commits?author=blesson-james" title="Tests">⚠️</a> <a href="https://github.com/dellhpc/omnia/issues?q=author%3Ablesson-james" title="Bug reports">🐛</a></td>
<td align="center"><a href="https://github.com/avinashvishwanath"><img src="https://avatars.githubusercontent.com/u/77823538?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avinashvishwanath</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=avinashvishwanath" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/abhishek-s-a"><img src="https://avatars.githubusercontent.com/u/73212230?v=4?s=100" width="100px;" alt=""/><br /><sub><b>abhishek-s-a</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=abhishek-s-a" title="Code">💻</a> <a href="https://github.com/dellhpc/omnia/commits?author=abhishek-s-a" title="Documentation">📖</a> <a href="https://github.com/dellhpc/omnia/commits?author=abhishek-s-a" title="Tests">⚠️</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/abhishek-s-a"><img src="https://avatars.githubusercontent.com/u/73212230?v=4?s=100" width="100px;" alt=""/><br /><sub><b>abhishek-s-a</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=abhishek-s-a" title="Code">💻</a> <a href="https://github.com/dellhpc/omnia/commits?author=abhishek-s-a" title="Documentation">📖</a> <a href="https://github.com/dellhpc/omnia/commits?author=abhishek-s-a" title="Tests">⚠️</a></td>
<td align="center"><a href="https://github.com/Franklin-Johnson"><img src="https://avatars.githubusercontent.com/u/84760103?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Franklin-Johnson</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=Franklin-Johnson" title="Code">💻</a> <a href="#blog-Franklin-Johnson" title="Blogposts">📝</a></td>
<td align="center"><a href="https://github.com/teiland7"><img src="https://avatars.githubusercontent.com/u/85184708?v=4?s=100" width="100px;" alt=""/><br /><sub><b>teiland7</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=teiland7" title="Code">💻</a> <a href="#blog-teiland7" title="Blogposts">📝</a></td>
<td align="center"><a href="https://github.com/VishnupriyaKrish"><img src="https://avatars.githubusercontent.com/u/72784834?v=4?s=100" width="100px;" alt=""/><br /><sub><b>VishnupriyaKrish</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=VishnupriyaKrish" title="Code">💻</a> <a href="https://github.com/dellhpc/omnia/commits?author=VishnupriyaKrish" title="Tests">⚠️</a></td>
<td align="center"><a href="https://rb.gy/ndlbhv"><img src="https://avatars.githubusercontent.com/u/48859631?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ishita Datta</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=ishitadatta" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/asu-wdizon"><img src="https://avatars.githubusercontent.com/u/81772355?v=4?s=100" width="100px;" alt=""/><br /><sub><b>William Dizon</b></sub></a><br /><a href="#tutorial-asu-wdizon" title="Tutorials">✅</a></td>
<td align="center"><a href="https://github.com/bssitton-BU"><img src="https://avatars.githubusercontent.com/u/14130464?v=4?s=100" width="100px;" alt=""/><br /><sub><b>bssitton-BU</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/issues?q=author%3Abssitton-BU" title="Bug reports">🐛</a></td>
<td align="center"><a href="https://github.com/hearnsj"><img src="https://avatars.githubusercontent.com/u/19259589?v=4?s=100" width="100px;" alt=""/><br /><sub><b>John Hearns</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/issues?q=author%3Ahearnsj" title="Bug reports">🐛</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/hearnsj"><img src="https://avatars.githubusercontent.com/u/19259589?v=4?s=100" width="100px;" alt=""/><br /><sub><b>John Hearns</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/issues?q=author%3Ahearnsj" title="Bug reports">🐛</a></td>
<td align="center"><a href="https://github.com/renzo-granados"><img src="https://avatars.githubusercontent.com/u/83035817?v=4?s=100" width="100px;" alt=""/><br /><sub><b>renzo-granados</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/issues?q=author%3Arenzo-granados" title="Bug reports">🐛</a></td>
<td align="center"><a href="https://github.com/kbuggenhout"><img src="https://avatars.githubusercontent.com/u/30471699?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kris buggenhout</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/issues?q=author%3Akbuggenhout" title="Bug reports">🐛</a></td>
<td align="center"><a href="https://github.com/jiad-vmware"><img src="https://avatars.githubusercontent.com/u/68653329?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jiad-vmware</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/issues?q=author%3Ajiad-vmware" title="Bug reports">🐛</a></td>
<td align="center"><a href="https://jlec.de"><img src="https://avatars.githubusercontent.com/u/79732?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Justin Lecher</b></sub></a><br /><a href="#ideas-jlec" title="Ideas, Planning, & Feedback">🤔</a></td>
<td align="center"><a href="https://github.com/Kavyabr23"><img src="https://avatars.githubusercontent.com/u/90390587?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kavyabr23</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=Kavyabr23" title="Code">💻</a> <a href="https://github.com/dellhpc/omnia/commits?author=Kavyabr23" title="Tests">⚠️</a></td>
<td align="center"><a href="https://github.com/vedaprakashanp"><img src="https://avatars.githubusercontent.com/u/90596073?v=4?s=100" width="100px;" alt=""/><br /><sub><b>vedaprakashanp</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=vedaprakashanp" title="Tests">⚠️</a> <a href="https://github.com/dellhpc/omnia/commits?author=vedaprakashanp" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/Bhagyashree-shetty"><img src="https://avatars.githubusercontent.com/u/90620926?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bhagyashree-shetty</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=Bhagyashree-shetty" title="Tests">⚠️</a> <a href="https://github.com/dellhpc/omnia/commits?author=Bhagyashree-shetty" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/Bhagyashree-shetty"><img src="https://avatars.githubusercontent.com/u/90620926?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bhagyashree-shetty</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=Bhagyashree-shetty" title="Tests">⚠️</a> <a href="https://github.com/dellhpc/omnia/commits?author=Bhagyashree-shetty" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/nihalranjan-hpc"><img src="https://avatars.githubusercontent.com/u/84398828?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nihal Ranjan</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=nihalranjan-hpc" title="Tests">⚠️</a> <a href="https://github.com/dellhpc/omnia/commits?author=nihalranjan-hpc" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/ptrinesh"><img src="https://avatars.githubusercontent.com/u/73214211?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ptrinesh</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=ptrinesh" title="Code">💻</a></td>
<td align="center"><a href="https://bandism.net/"><img src="https://avatars.githubusercontent.com/u/22633385?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ikko Ashimine</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=eltociear" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/Lakshmi-Patneedi"><img src="https://avatars.githubusercontent.com/u/94051091?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lakshmi-Patneedi</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=Lakshmi-Patneedi" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/Artlands"><img src="https://avatars.githubusercontent.com/u/31781106?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jie Li</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=Artlands" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/githubyongchen"><img src="https://avatars.githubusercontent.com/u/5414112?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yong Chen</b></sub></a><br /><a href="#design-githubyongchen" title="Design">🎨</a></td>
<td align="center"><a href="http://www.myweb.ttu.edu/ngu00336/"><img src="https://avatars.githubusercontent.com/u/18387748?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nvtngan</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=Zipexpo" title="Code">💻</a> <a href="#plugin-Zipexpo" title="Plugin/utility libraries">🔌</a></td>
</tr>
<tr>
<td align="center"><a href="http://www.myweb.ttu.edu/ngu00336/"><img src="https://avatars.githubusercontent.com/u/18387748?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nvtngan</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=Zipexpo" title="Code">💻</a> <a href="#plugin-Zipexpo" title="Plugin/utility libraries">🔌</a></td>
<td align="center"><a href="https://github.com/tamilarasansubrama1"><img src="https://avatars.githubusercontent.com/u/100588942?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tamilarasansubrama1</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=tamilarasansubrama1" title="Tests">⚠️</a> <a href="https://github.com/dellhpc/omnia/commits?author=tamilarasansubrama1" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/shemasr"><img src="https://avatars.githubusercontent.com/u/100141664?v=4?s=100" width="100px;" alt=""/><br /><sub><b>shemasr</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/issues?q=author%3Ashemasr" title="Bug reports">🐛</a> <a href="https://github.com/dellhpc/omnia/commits?author=shemasr" title="Code">💻</a> <a href="https://github.com/dellhpc/omnia/commits?author=shemasr" title="Tests">⚠️</a></td>
<td align="center"><a href="https://github.com/Khushboodholi"><img src="https://avatars.githubusercontent.com/u/12014935?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Khushboodholi</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=Khushboodholi" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/naresh3774"><img src="https://avatars.githubusercontent.com/u/101410892?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Naresh Sharma</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/issues?q=author%3Anaresh3774" title="Bug reports">🐛</a></td>
<td align="center"><a href="https://github.com/JonHass"><img src="https://avatars.githubusercontent.com/u/6976486?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jon Hass</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=JonHass" title="Documentation">📖</a> <a href="#design-JonHass" title="Design">🎨</a></td>
<td align="center"><a href="https://github.com/KalyanKonatham"><img src="https://avatars.githubusercontent.com/u/101596828?v=4?s=100" width="100px;" alt=""/><br /><sub><b>KalyanKonatham</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/issues?q=author%3AKalyanKonatham" title="Bug reports">🐛</a></td>
Expand All @@ -110,6 +110,7 @@ Our thanks go to everyone who makes Omnia possible ([emoji key](https://allcontr
<td align="center"><a href="https://github.com/srinandini-karumuri"><img src="https://avatars.githubusercontent.com/u/104345504?v=4?s=100" width="100px;" alt=""/><br /><sub><b>srinandini-karumuri</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=srinandini-karumuri" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/Rishabhm47"><img src="https://avatars.githubusercontent.com/u/106973551?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rishabhm47</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=Rishabhm47" title="Tests">⚠️</a> <a href="https://github.com/dellhpc/omnia/commits?author=Rishabhm47" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/vaishakh-pm"><img src="https://avatars.githubusercontent.com/u/104622022?v=4?s=100" width="100px;" alt=""/><br /><sub><b>vaishakh-pm</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=vaishakh-pm" title="Tests">⚠️</a> <a href="https://github.com/dellhpc/omnia/commits?author=vaishakh-pm" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/shridhar-sharma"><img src="https://avatars.githubusercontent.com/u/104621992?v=4?s=100" width="100px;" alt=""/><br /><sub><b>shridhar-sharma</b></sub></a><br /><a href="https://github.com/dellhpc/omnia/commits?author=shridhar-sharma" title="Tests">⚠️</a> <a href="https://github.com/dellhpc/omnia/commits?author=shridhar-sharma" title="Code">💻</a></td>
</tr>
</table>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,13 +264,6 @@
fail_msg: "{{ fail_awx_organization }}"
tags: [ validate, awx ]

- name: Create default directory to store omnia files
file:
path: "{{ omnia_default_path }}"
state: directory
mode: "{{ mount_dir_perm }}"
tags: init

- name: Make mount directory for grafana if it doesnt exist
file:
path: "{{ mount_location }}"
Expand Down
4 changes: 4 additions & 0 deletions control_plane/roles/control_plane_common/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
import_tasks: internet_validation.yml
tags: init

- name: Configure omnia version
import_tasks: omnia_version_configuration.yml
tags: init

- name: Common packages installation
import_tasks: package_installation.yml
tags: init
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# Copyright 2022 Dell Inc. or its subsidiaries. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
---

- name: Create default directory to store omnia files
file:
path: "{{ omnia_default_path }}"
state: directory
mode: "{{ mount_dir_perm }}"

- name: Check omnia_version is already present
stat:
path: "{{ dest_omnia_version }}"
register: omnia_version_stat

- block:
- name: Include {{ dest_omnia_version }} as variable
include_vars: "{{ dest_omnia_version }}"

- name: Check omnia_version in repository
command: grep "omnia_version:" "{{ src_omnia_version }}"
changed_when: false
register: omnia_version_check

- name: Set new_omnia_version
set_fact:
new_omnia_version: "{{ omnia_version_check.stdout | regex_replace('omnia_version: ','') }}"

- name: Do you want to proceed with upgrade
pause:
prompt: "{{ enable_upgrade_prompt_msg }}"
register: enable_upgrade_input
when: new_omnia_version | float > omnia_version | float

- name: Abort control_plane.yml execution
fail:
msg: "{{ enable_upgrade_fail_msg }}"
when:
- enable_upgrade_input.user_input is defined
- enable_upgrade_input.user_input | lower != "yes"

- name: Enabling control plane upgrade
fail:
msg: "{{ enable_upgrade_warn_msg }}"
when:
- enable_upgrade_input.user_input is defined
- enable_upgrade_input.user_input | lower == "yes"
when: omnia_version_stat.stat.exists

- name: Set omnia_installation_path in omnia_version
replace:
path: "{{ src_omnia_version }}"
regexp: "^(.*)omnia_installation_path(.*)"
replace: "omnia_installation_path: {{ playbook_dir.split('control_plane')[0] }}"

- name: Copy omnia_version
copy:
src: "{{ src_omnia_version }}"
dest: "{{ dest_omnia_version }}"
mode: "{{ mount_dir_perm }}"
Loading

0 comments on commit 6e9916e

Please sign in to comment.