commit 75bf1532e71c99429a7ce33e8d794eff481899b5
author Filip Pytloun <fpytloun@mirantis.com> Fri Jun 09 14:31:11 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Fri Jun 09 14:31:13 2017 +0000
tree df6f9e0a560c9e067be7cce35a5ca1115231d9d5
parent fe033a8f7eb74d820d8b22de6ed26257f519cadc
parent 5b0c764fa420bf57e824958c9bef4641e9fba5a8

Merge changes from topic 'rundeck-cis-fixes'

* changes:
  Docker overlay network for Rundeck executions
  Import OpenStack CIS Collectors Jobs
  Accept RD_OPTION_* env variables from Rundeck

docker/swarm/network/runbook.yml

diff --git a/docker/swarm/network/runbook.yml b/docker/swarm/network/runbook.yml
new file mode 100644
index 0000000..557b852
--- /dev/null
+++ b/docker/swarm/network/runbook.yml
@@ -0,0 +1,10 @@
+parameters:
+  _param:
+    docker_runbook_subnet: 10.40.0.0/24
+  docker:
+    client:
+      network:
+        runbook:
+          subnet: ${_param:docker_runbook_subnet}
+          driver: overlay
+          attachable: true

rundeck/client/project/cicd.yml

diff --git a/rundeck/client/project/cicd.yml b/rundeck/client/project/cicd.yml
index e33fcae..1a4b228 100644
--- a/rundeck/client/project/cicd.yml
+++ b/rundeck/client/project/cicd.yml
@@ -1,4 +1,13 @@
 parameters:
+  _param:
+    rundeck_cis_os_auth_url: none
+    rundeck_cis_os_username: admin
+    rundeck_cis_os_password: password
+    rundeck_cis_os_project_name: admin
+    rundeck_cis_os_domain_id: default
+    rundeck_cis_jobs_repository: https://gerrit.mcp.mirantis.net/oss/rundeck-cis-jobs
+    rundeck_cis_jobs_revision: master
+    rundeck_cis_elasticsearch_url: none
   rundeck:
     client:
       project:
@@ -20,3 +29,26 @@
               hostname: ${_param:cluster_node03_address}
               username: ${_param:rundeck_runbook_user}
               tags: [cicd, docker]
+          plugin:
+            import:
+              address: ${_param:rundeck_cis_jobs_repository}
+              branch: ${_param:rundeck_cis_jobs_revision}
+      secret:
+        cis/elasticsearch/url:
+          type: password
+          content: ${_param:rundeck_cis_elasticsearch_url}
+        cis/openstack/auth_url:
+          type: password
+          content: ${_param:rundeck_cis_os_auth_url}
+        cis/openstack/username:
+          type: password
+          content: ${_param:rundeck_cis_os_username}
+        cis/openstack/password:
+          type: password
+          content: ${_param:rundeck_cis_os_password}
+        cis/openstack/project_name:
+          type: password
+          content: ${_param:rundeck_cis_os_project_name}
+        cis/openstack/domain_id:
+          type: password
+          content: ${_param:rundeck_cis_os_domain_id}

rundeck/client/runbook.yml

diff --git a/rundeck/client/runbook.yml b/rundeck/client/runbook.yml
index 27abaa6..a41481a 100644
--- a/rundeck/client/runbook.yml
+++ b/rundeck/client/runbook.yml
@@ -22,3 +22,5 @@
           public_keys:
             - key: ${_param:rundeck_runbook_public_key}
           user: ${linux:system:user:runbook}
+      accept_env:
+        - RD_OPTION_*