Merge "Added description to some Jenkins git mirror pipeline params"
diff --git a/docker/swarm/stack/rundeck.yml b/docker/swarm/stack/rundeck.yml
index 8ab0554..88693be 100644
--- a/docker/swarm/stack/rundeck.yml
+++ b/docker/swarm/stack/rundeck.yml
@@ -25,6 +25,7 @@
- /srv/volumes/rundeck/etc/realm.properties:/etc/rundeck/realm.properties
- /srv/volumes/rundeck/etc/rundeck-config.properties:/etc/rundeck/rundeck-config.properties
- /srv/volumes/rundeck/rundeck:/var/rundeck
+ - /srv/volumes/rundeck/data:/var/lib/rundeck/data
- /srv/volumes/rundeck/log:/var/log/rundeck
- /srv/volumes/rundeck/logs:/var/lib/rundeck/logs
- /srv/volumes/rundeck/plugins:/opt/rundeck-plugins
diff --git a/elasticsearch/client/index/janitor_monkey.yml b/elasticsearch/client/index/cis_openstack.yml
similarity index 92%
rename from elasticsearch/client/index/janitor_monkey.yml
rename to elasticsearch/client/index/cis_openstack.yml
index bef92ae..3136f73 100644
--- a/elasticsearch/client/index/janitor_monkey.yml
+++ b/elasticsearch/client/index/cis_openstack.yml
@@ -7,9 +7,9 @@
index:
cis-openstack:
enabled: true
- force_operation: true
+ force_operation: false
definition:
template: cis-openstack
settings:
number_of_shards: ${_param:janitor_monkey_cis_openstack_shards}
- number_of_replicas: ${_param:janitor_monkey_cis_openstack_replicas}
\ No newline at end of file
+ number_of_replicas: ${_param:janitor_monkey_cis_openstack_replicas}
diff --git a/elasticsearch/client/index/pushkin.yml b/elasticsearch/client/index/pushkin.yml
index 1d17c77..668a770 100644
--- a/elasticsearch/client/index/pushkin.yml
+++ b/elasticsearch/client/index/pushkin.yml
@@ -7,7 +7,7 @@
index:
notifications:
enabled: true
- force_operation: true
+ force_operation: false
definition:
template: notifications
settings:
@@ -39,4 +39,4 @@
fields:
keyword:
type: keyword
- ignore_above: 256
\ No newline at end of file
+ ignore_above: 256
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index cbe89ca..0ae502b 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -12,6 +12,9 @@
python-pymysql:
fromrepo: ${_param:openstack_version}
version: latest
+ python-cryptography:
+ fromrepo: ${_param:openstack_version}
+ version: latest
keystone:
server:
enabled: true