Merge "Remove legacy radosgw configuration"
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index ca55601..7a818e0 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -17,7 +17,9 @@
docker_image_gerrit: "${_param:mcp_docker_registry}/mirantis/cicd/gerrit:${_param:mcp_version}"
# mysql:5.6
docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:${_param:mcp_version}"
- docker_image_jenkins_slave: ${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:${_param:mcp_version}
+ # jenkins:2.121.3
+ docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:${_param:mcp_version}"
+ docker_image_jenkins_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:${_param:mcp_version}"
# model-generator
docker_image_operations_api: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-api:${_param:mcp_version}"
docker_image_operations_ui: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-ui:${_param:mcp_version}"
diff --git a/defaults/init.yml b/defaults/init.yml
index b19f2c8..dc5cc49 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -13,6 +13,7 @@
- system.defaults.debmirror
- system.defaults.docker_images
- system.defaults.gerrit
+- system.defaults.keepalived
parameters:
_param:
mcp_version: stable
diff --git a/defaults/keepalived/init.yml b/defaults/keepalived/init.yml
new file mode 100644
index 0000000..f39d80e
--- /dev/null
+++ b/defaults/keepalived/init.yml
@@ -0,0 +1,3 @@
+parameters:
+ _param:
+ keepalived_openstack_web_vrrp_script_check_pidof_args: "nginx"
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 334fd43..441e1c1 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -14,6 +14,7 @@
openstack_rabbitmq_port: 5672
openstack_rabbitmq_x509_enabled: False
# Openstack memcache
+ openstack_memcached_server_bind_address: 0.0.0.0
openstack_memcache_security_enabled: False
openstack_memcache_security_strategy: 'ENCRYPT'
openstack_memcached_proto_tcp_enabled: True
diff --git a/docker/client/compose/service/jenkins.yml b/docker/client/compose/service/jenkins.yml
index 5054909..55aacdc 100644
--- a/docker/client/compose/service/jenkins.yml
+++ b/docker/client/compose/service/jenkins.yml
@@ -2,7 +2,6 @@
- system.docker.client.compose
parameters:
_param:
- docker_image_jenkins: mirantis/jenkins:2.100
jenkins_master_extra_opts: ""
jenkins_master_executors_num: 4
jenkins_master_max_concurent_requests: 40
diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index 890f8da..45c952f 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -2,7 +2,6 @@
- system.docker
parameters:
_param:
- docker_image_jenkins: mirantis/jenkins:2.100
jenkins_master_extra_opts: ""
jenkins_master_executors_num: 4
jenkins_master_max_concurent_requests: 40
diff --git a/jenkins/client/job/stacklight/cookiecutter.yml b/jenkins/client/job/stacklight/cookiecutter.yml
index e057a26..2500254 100644
--- a/jenkins/client/job/stacklight/cookiecutter.yml
+++ b/jenkins/client/job/stacklight/cookiecutter.yml
@@ -1,74 +1,2 @@
-parameters:
- jenkins:
- client:
- job:
- stacklight-test-cookiecutter-model:
- display_name: stacklight-test-cookiecutter-model
- name: stacklight-test-cookiecutter-model
- concurrent: true
- description: Test specified cookiecutter context
- discard:
- build:
- keep_num: 60
- artifact:
- keep_num: 60
- type: workflow-scm
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines"
- credentials: "gerrit"
- branch: 'master'
- script: test-cookiecutter-model-pipeline.groovy
- trigger:
- timer:
- spec: "H H(0-3) * * *"
- param:
- CREDENTIALS_ID:
- type: string
- description: "ID of jenkins credentials for connecting to gerrit"
- default: "gerrit"
- COOKIECUTTER_TEMPLATE_CONTEXT_FILE:
- type: string
- description: "Context for cookiecutter template specified as filename"
- default: 'stacklight-openstack-ovs-core-pike'
- OPENSTACK_ENVIRONMENT:
- type: choice
- description: "Target openstack environment"
- choices:
- - devcloud
- - presales
- - oscore_devcloud
- OPENSTACK_API_CREDENTIALS:
- type: string
- description: "Credentials to the OpenStack API"
- OPENSTACK_API_PROJECT:
- type: string
- default: "mcp-stacklight"
- HEAT_STACK_ZONE:
- type: string
- default: "mcp-stacklight"
- FLAVOR_PREFIX:
- type: string
- default: 'dev'
- RUN_SMOKE:
- type: boolean
- description: "Run smoke after deployment or not (bool)"
- default: 'false'
- COOKIECUTTER_EXTRA_CONTEXT:
- type: text
- description: "Extra context items, will be merged to COOKIECUTTER_TEMPLATE_CONTEXT_FILE"
- default: |-
- #Extra context that will be merged with content of COOKIECUTTER_TEMPLATE_CONTEXT_FILE
- default_context:
- openssh_groups: "qa_scale,oscore_devops,networking,tcpcloud,stacklight,k8s_team,drivetrain"
- cookiecutter_template_url: ssh://gerrit.mcp.mirantis.com:29418/mk/cookiecutter-templates.git
- cookiecutter_template_branch: 'master'
- shared_reclass_url: ssh://gerrit.mcp.mirantis.com:29418/salt-models/reclass-system.git
- shared_reclass_branch: 'master'
- STACK_INSTALL:
- type: string
- default: 'core,openstack,ovs,stacklight'
- STACK_DELETE:
- type: boolean
- description: "Delete Heat stack when finished (bool). Don't enable it if you need to use the lab after"
- default: 'true'
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/jenkins/client/job/stacklight/init.yml b/jenkins/client/job/stacklight/init.yml
index 6d8f563..2500254 100644
--- a/jenkins/client/job/stacklight/init.yml
+++ b/jenkins/client/job/stacklight/init.yml
@@ -1,2 +1,2 @@
-classes:
- - system.jenkins.client.job.stacklight.cookiecutter
+# This file will be removed in Q3
+# jobs was moved into salt-models/infra repo
diff --git a/keepalived/cluster/instance/openstack_web_public_vip.yml b/keepalived/cluster/instance/openstack_web_public_vip.yml
index 144ddf2..363f23b 100644
--- a/keepalived/cluster/instance/openstack_web_public_vip.yml
+++ b/keepalived/cluster/instance/openstack_web_public_vip.yml
@@ -11,7 +11,7 @@
cluster:
vrrp_scripts:
check_pidof:
- args: "nginx"
+ args: ${_param:keepalived_openstack_web_vrrp_script_check_pidof_args}
interval: 10
rise: 1
fall: 1
@@ -23,4 +23,4 @@
interface: ${_param:keepalived_openstack_web_public_vip_interface}
virtual_router_id: 132
priority: ${_param:keepalived_vip_priority}
- track_script: check_pidof
\ No newline at end of file
+ track_script: check_pidof
diff --git a/memcached/server/single.yml b/memcached/server/single.yml
index fabef56..7a164c0 100644
--- a/memcached/server/single.yml
+++ b/memcached/server/single.yml
@@ -4,6 +4,7 @@
memcached:
server:
bind:
+ address: ${_param:openstack_memcached_server_bind_address}
proto:
tcp:
enabled: ${_param:openstack_memcached_proto_tcp_enabled}