From eb2b90a11ebe50953f69aa49949f8db4a95d4d6a Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Sun, 26 Jul 2015 20:12:25 +0200
Subject: [PATCH] Local installation script: add more plugins and roles
---
ansible-playbook.sh | 5 ++++-
ansible.sh | 5 ++++-
setup_local.yml | 6 ++++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ansible-playbook.sh b/ansible-playbook.sh
index c64ecda4..729433b4 100755
--- a/ansible-playbook.sh
+++ b/ansible-playbook.sh
@@ -1,6 +1,9 @@
#!/bin/bash
-SECRETS="$( cd ~/.ansible && pwd )/secrets"
+if [ -d ~/.ansible ]
+ then
+ SECRETS="$( cd ~/.ansible && pwd )/secrets"
+fi
cd $( cd $(dirname $(realpath $0)) ; pwd )
if [ $1 == "local" ]
diff --git a/ansible.sh b/ansible.sh
index a33ed0a5..629343c1 100755
--- a/ansible.sh
+++ b/ansible.sh
@@ -1,6 +1,9 @@
#!/bin/bash
-SECRETS="$( cd ~/.ansible && pwd )/secrets"
+if [ -d ~/.ansible ]
+ then
+ SECRETS="$( cd ~/.ansible && pwd )/secrets"
+fi
cd $( cd $(dirname $(realpath $0)) ; pwd )
if [ -f ./inventory/inventory ]
diff --git a/setup_local.yml b/setup_local.yml
index 0bcd6583..47296b3d 100644
--- a/setup_local.yml
+++ b/setup_local.yml
@@ -15,9 +15,9 @@
repo: "git@gitlab.paragon-es.de"
plugins:
- name: "jiffybox"
- repo: "git@github.com:jurgenhaas/ansible-plugin-jiffybox.git"
+ repo: "{{ repo }}:ansible-plugins/jiffybox.git"
- name: "serverdensity"
- repo: "git@github.com:jurgenhaas/ansible-plugin-serverdensity.git"
+ repo: "{{ repo }}:ansible-plugins/serverdensity.git"
tasks:
- name: "Get other repositories"
git:
@@ -33,6 +33,8 @@
force: no
- repo: "{{ repo }}:ansible-roles/gitlab.git"
dest: "./roles/gitlab"
+ - repo: "{{ repo }}:ansible-roles/serverdensity.git"
+ dest: "./roles/serverdensity"
- name: "Get plugins"
git:
accept_hostkey: yes
--
GitLab