Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reverse merge for v0.4 branch #980

Closed
wants to merge 1 commit into from
Closed

Reverse merge for v0.4 branch #980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion core/src/epicli/data/common/ansible/ansible_inventory.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,9 @@
[all:vars]
ansible_user={{ cluster_model.specification.admin_user.name }}
ansible_ssh_private_key_file={{ cluster_model.specification.admin_user.key_path }}
# todo: settings of StrictHostKeyChecking from epiphany configuration
# --- SSH options ---
# todo: manage StrictHostKeyChecking from Epiphany configuration
# Always appended to the default command line for sftp, scp, and ssh
ansible_ssh_common_args='-o StrictHostKeyChecking=no'
# Always appended to the default ssh command line
ansible_ssh_extra_args='-o ServerAliveInterval=60 -o ServerAliveCountMax=1'
8 changes: 2 additions & 6 deletions core/src/epicli/data/common/ansible/playbooks/roles/common/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,9 @@
- include_tasks: firewall/configure-fw.yml
tags: firewall

- name: Get environment variables
command: env
register: env_output
changed_when: false

- name: Print environment variables
debug: msg={{ env_output.stdout_lines }}
debug:
msg: "{{ ansible_env }}"

- name: Adjust swappiness parameter
sysctl:
Expand Down
9 changes: 7 additions & 2 deletions ...i/data/common/ansible/playbooks/roles/repository/files/server/Debian/create-repository.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,13 @@ if $IS_OFFLINE_MODE = true; then
echo "updating apt..."
apt -y update
else
# for online mode just install apache
apt -y install apache2 dpkg-dev
# for online mode just install apache (force non-interactive mode, ref: https://bugs.launchpad.net/ubuntu/+source/ansible/+bug/1833013)
DEBIAN_FRONTEND=noninteractive \
UCF_FORCE_CONFOLD=1 \
apt-get \
-o Dpkg::Options::=--force-confold \
-o Dpkg::Options::=--force-confdef \
-y -q install apache2 dpkg-dev

# -m is important because it allow same packages with different versions
# 'cd' is needed here becuase 'dpkg-scanpackages' prepends path to "Filename" field in Packages.gz
Expand Down