Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.package
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos.package
Commits
62c87c95
Commit
62c87c95
authored
Mar 04, 2016
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
playbook: Ubuntu 15.04 is also supported now.
parent
8be940ac
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
playbook/roles/install-script/templates/base_setup.j2
playbook/roles/install-script/templates/base_setup.j2
+7
-2
No files found.
playbook/roles/install-script/templates/base_setup.j2
View file @
62c87c95
...
@@ -42,7 +42,7 @@ fi
...
@@ -42,7 +42,7 @@ fi
# Warn users who aren't on an explicitly supported distro, but allow them to
# Warn users who aren't on an explicitly supported distro, but allow them to
# override check and attempt installation with ``export FORCE=yes``
# override check and attempt installation with ``export FORCE=yes``
if [[ ! ${DISTRO} =~ (wheezy|jessie|trusty|rhel7|rhel6) ]]; then
if [[ ! ${DISTRO} =~ (wheezy|jessie|trusty|
vivid|
rhel7|rhel6) ]]; then
echo "WARNING: this script has not been tested on $DISTRO"
echo "WARNING: this script has not been tested on $DISTRO"
if [[ "$FORCE" != "yes" ]]; then
if [[ "$FORCE" != "yes" ]]; then
die $LINENO "If you wish to run this script anyway run with FORCE=yes"
die $LINENO "If you wish to run this script anyway run with FORCE=yes"
...
@@ -128,9 +128,14 @@ if is_ubuntu && [[ $DISTRO == "trusty" ]]; then
...
@@ -128,9 +128,14 @@ if is_ubuntu && [[ $DISTRO == "trusty" ]]; then
is_package_installed python-pycurl || install_package python-pycurl
is_package_installed python-pycurl || install_package python-pycurl
fi
fi
if is_ubuntu && [[ $DISTRO == "vivid" ]]; then
is_package_installed python-apt || install_package python-apt
is_package_installed python-pycurl || install_package python-pycurl
fi
ANSIBLE_PLUGIN_LOCATION="/usr/share/ansible_plugins/callback_plugins/"
ANSIBLE_PLUGIN_LOCATION="/usr/share/ansible_plugins/callback_plugins/"
mkdir -p $ANSIBLE_PLUGIN_LOCATION
mkdir -p $ANSIBLE_PLUGIN_LOCATION
{{ lookup('file', 'roles/install-script/files/log_parse') }}
{{ lookup('file', 'roles/install-script/files/log_parse') }}
ansible localhost -m easy_install -a name=slapcache --connection=local
ansible localhost -m easy_install -a name=slapcache --connection=local
ansible localhost -m easy_install -a name=requests --connection=local
ansible localhost -m easy_install -a name=requests --connection=local
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment