From fe2f3416b547ecbbfcc3c1d8d001bb3088587650 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Thu, 29 Sep 2016 13:54:14 -0400 Subject: [PATCH] Rename jenkins-node module for ansible v2 compatibility Signed-off-by: David Galloway --- ansible/examples/slave.yml | 4 ++-- ansible/examples/slave_static.yml | 4 ++-- ansible/library/{jenkins-node => jenkins_node} | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) rename ansible/library/{jenkins-node => jenkins_node} (97%) diff --git a/ansible/examples/slave.yml b/ansible/examples/slave.yml index 5ecc0013c..e61ea1017 100644 --- a/ansible/examples/slave.yml +++ b/ansible/examples/slave.yml @@ -222,7 +222,7 @@ key: "{{ lookup('file', 'playbook/files/ssh/hostkeys/github.com.pub') }}" - name: register the new slave to jenkins master with ssh - jenkins-node: + jenkins_node: username: "{{ api_user }}" uri: "{{ api_uri }}" password: "{{ token }}" @@ -239,7 +239,7 @@ when: not use_jnlp - name: register the new slave to jenkins master with jnlp - jenkins-node: + jenkins_node: username: "{{ api_user }}" uri: "{{ api_uri }}" password: "{{ token }}" diff --git a/ansible/examples/slave_static.yml b/ansible/examples/slave_static.yml index 3dffe8e9e..f9c5e138a 100644 --- a/ansible/examples/slave_static.yml +++ b/ansible/examples/slave_static.yml @@ -254,7 +254,7 @@ key: "{{ lookup('file', 'files/ssh/hostkeys/github.com.pub') }}" - name: register the new slave to jenkins master with ssh - jenkins-node: + jenkins_node: username: "{{ api_user }}" uri: "{{ api_uri }}" password: "{{ token }}" @@ -271,7 +271,7 @@ when: not use_jnlp - name: register the new slave to jenkins master with jnlp - jenkins-node: + jenkins_node: username: "{{ api_user }}" uri: "{{ api_uri }}" password: "{{ token }}" diff --git a/ansible/library/jenkins-node b/ansible/library/jenkins_node similarity index 97% rename from ansible/library/jenkins-node rename to ansible/library/jenkins_node index b8e83c78f..f37846dab 100644 --- a/ansible/library/jenkins-node +++ b/ansible/library/jenkins_node @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- DOCUMENTATION = """ -module: jenkins-node +module: jenkins_node short_decription: Manage Jenkins nodes description: - This module provides some management features to control Jenkins @@ -92,12 +92,12 @@ author: EXAMPLES = """ # Create new node - name: Create new node - jenkins-node: uri={{ jenkins_uri }} username={{ user }} password={{ password }} + jenkins_node: uri={{ jenkins_uri }} username={{ user }} password={{ password }} name={{ node_name }} operation=create # Delete an existing node - name: Delete a node - jenkins-node: uri={{ jenkins_uri }} username={{ user }} password={{ password }} + jenkins_node: uri={{ jenkins_uri }} username={{ user }} password={{ password }} name={{ node_name }} operation=delete """ -- 2.47.3