Merge "Add default SALT_MASTER_URL for deploy pipeline"
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/pike.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/pike.yml
new file mode 100644
index 0000000..971e8fa
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/openstack/pike.yml
@@ -0,0 +1,25 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+
+ mirror_mirantis_openstack_pike_xenial_source: http://apt.mirantis.com/xenial/openstack/pike/
+ mirror_mirantis_openstack_pike_xenial_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_pike_xenial_components: main
+ mirror_mirantis_openstack_pike_xenial_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_pike_xenial_gpgkeys:
+ - A76882D3
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_pike_xenial:
+ source: ${_param:mirror_mirantis_openstack_pike_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_pike_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_pike_xenial_components}
+ architectures: amd64
+ key_url: ${_param:mirror_mirantis_openstack_pike_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_pike_xenial_gpgkeys}
+ publisher:
+ component: main
+ distributions:
+ - ubuntu-xenial/openstack/pike/${_param:apt_mk_version}
+
diff --git a/galera/server/database/aodh.yml b/galera/server/database/aodh.yml
index f5095d2..c7cdfdc 100644
--- a/galera/server/database/aodh.yml
+++ b/galera/server/database/aodh.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mysql_aodh_ssl_option: []
mysql:
server:
database:
@@ -9,7 +11,9 @@
password: ${_param:mysql_aodh_password}
host: '%'
rights: all
+ ssl_option: ${_param:mysql_aodh_ssl_option}
- name: aodh
password: ${_param:mysql_aodh_password}
host: ${_param:cluster_vip_address}
rights: all
+ ssl_option: ${_param:mysql_aodh_ssl_option}
diff --git a/galera/server/database/barbican.yml b/galera/server/database/barbican.yml
index 4759439..a292660 100644
--- a/galera/server/database/barbican.yml
+++ b/galera/server/database/barbican.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mysql_barbican_ssl_option: []
mysql:
server:
database:
@@ -9,7 +11,9 @@
password: ${_param:mysql_barbican_password}
host: '%'
rights: all
+ ssl_option: ${_param:mysql_barbican_ssl_option}
- name: barbican
password: ${_param:mysql_barbican_password}
host: ${_param:cluster_vip_address}
rights: all
+ ssl_option: ${_param:mysql_barbican_ssl_option}
diff --git a/galera/server/database/ceilometer.yml b/galera/server/database/ceilometer.yml
index b33c8f9..08a7f8b 100644
--- a/galera/server/database/ceilometer.yml
+++ b/galera/server/database/ceilometer.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mysql_ceilometer_ssl_option: []
mysql:
server:
database:
@@ -9,7 +11,9 @@
password: ${_param:mysql_ceilometer_password}
host: '%'
rights: all
+ ssl_option: ${_param:mysql_ceilometer_ssl_option}
- name: ceilometer
password: ${_param:mysql_ceilometer_password}
host: ${_param:cluster_local_address}
rights: all
+ ssl_option: ${_param:mysql_ceilometer_ssl_option}
diff --git a/galera/server/database/cinder.yml b/galera/server/database/cinder.yml
index 08b6ddb..6478cb8 100644
--- a/galera/server/database/cinder.yml
+++ b/galera/server/database/cinder.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mysql_cinder_ssl_option: []
mysql:
server:
database:
@@ -9,7 +11,9 @@
password: ${_param:mysql_cinder_password}
host: '%'
rights: all
+ ssl_option: ${_param:mysql_cinder_ssl_option}
- name: cinder
password: ${_param:mysql_cinder_password}
host: ${_param:cluster_local_address}
rights: all
+ ssl_option: ${_param:mysql_cinder_ssl_option}
diff --git a/galera/server/database/designate.yml b/galera/server/database/designate.yml
index 107e3ae..43a76f9 100644
--- a/galera/server/database/designate.yml
+++ b/galera/server/database/designate.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mysql_designate_ssl_option: []
mysql:
server:
database:
@@ -9,10 +11,12 @@
password: ${_param:mysql_designate_password}
host: '%'
rights: all
+ ssl_option: ${_param:mysql_designate_ssl_option}
- name: designate
password: ${_param:mysql_designate_password}
host: ${_param:cluster_vip_address}
rights: all
+ ssl_option: ${_param:mysql_designate_ssl_option}
designate_pool_manager:
encoding: utf8
users:
@@ -20,7 +24,9 @@
password: ${_param:mysql_designate_password}
host: '%'
rights: all
+ ssl_option: ${_param:mysql_designate_ssl_option}
- name: designate
password: ${_param:mysql_designate_password}
host: ${_param:cluster_vip_address}
rights: all
+ ssl_option: ${_param:mysql_designate_ssl_option}
diff --git a/galera/server/database/glance.yml b/galera/server/database/glance.yml
index 7e5e443..7af81d8 100644
--- a/galera/server/database/glance.yml
+++ b/galera/server/database/glance.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mysql_glance_ssl_option: []
mysql:
server:
database:
@@ -9,7 +11,9 @@
password: ${_param:mysql_glance_password}
host: '%'
rights: all
+ ssl_option: ${_param:mysql_glance_ssl_option}
- name: glance
password: ${_param:mysql_glance_password}
host: ${_param:cluster_local_address}
rights: all
+ ssl_option: ${_param:mysql_glance_ssl_option}
diff --git a/galera/server/database/grafana.yml b/galera/server/database/grafana.yml
index fa4742e..3bfee87 100644
--- a/galera/server/database/grafana.yml
+++ b/galera/server/database/grafana.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mysql_grafana_ssl_option: []
mysql:
server:
database:
@@ -9,8 +11,10 @@
password: ${_param:mysql_grafana_password}
host: '%'
rights: all
+ ssl_option: ${_param:mysql_grafana_ssl_option}
- name: grafana
password: ${_param:mysql_grafana_password}
host: ${_param:cluster_local_address}
rights: all
+ ssl_option: ${_param:mysql_grafana_ssl_option}
diff --git a/galera/server/database/graphite.yml b/galera/server/database/graphite.yml
index 8ba6efd..595c16b 100644
--- a/galera/server/database/graphite.yml
+++ b/galera/server/database/graphite.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mysql_graphite_ssl_option: []
mysql:
server:
database:
@@ -9,3 +11,4 @@
password: '${_param:mysql_graphite_password}'
host: '%'
rights: 'all'
+ ssl_option: ${_param:mysql_graphite_ssl_option}
diff --git a/galera/server/database/heat.yml b/galera/server/database/heat.yml
index 0d716d8..31b3968 100644
--- a/galera/server/database/heat.yml
+++ b/galera/server/database/heat.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mysql_heat_ssl_option: []
mysql:
server:
database:
@@ -9,7 +11,9 @@
password: ${_param:mysql_heat_password}
host: '%'
rights: all
+ ssl_option: ${_param:mysql_heat_ssl_option}
- name: heat
password: ${_param:mysql_heat_password}
host: ${_param:cluster_local_address}
rights: all
+ ssl_option: ${_param:mysql_heat_ssl_option}
diff --git a/galera/server/database/ironic.yml b/galera/server/database/ironic.yml
index 8cb14a3..a478aeb 100644
--- a/galera/server/database/ironic.yml
+++ b/galera/server/database/ironic.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mysql_ironic_ssl_option: []
mysql:
server:
database:
@@ -9,7 +11,9 @@
password: ${_param:mysql_ironic_password}
host: '%'
rights: all
+ ssl_option: ${_param:mysql_ironic_ssl_option}
- name: ironic
password: ${_param:mysql_ironic_password}
host: ${_param:cluster_local_address}
rights: all
+ ssl_option: ${_param:mysql_ironic_ssl_option}
diff --git a/galera/server/database/keystone.yml b/galera/server/database/keystone.yml
index fc2c5eb..d6483cd 100644
--- a/galera/server/database/keystone.yml
+++ b/galera/server/database/keystone.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mysql_keystone_ssl_option: []
mysql:
server:
database:
@@ -9,7 +11,9 @@
password: ${_param:mysql_keystone_password}
host: '%'
rights: all
+ ssl_option: ${_param:mysql_keystone_ssl_option}
- name: keystone
password: ${_param:mysql_keystone_password}
host: ${_param:cluster_local_address}
rights: all
+ ssl_option: ${_param:mysql_keystone_ssl_option}
diff --git a/galera/server/database/neutron.yml b/galera/server/database/neutron.yml
index 58dd012..b5ee606 100644
--- a/galera/server/database/neutron.yml
+++ b/galera/server/database/neutron.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mysql_neutron_ssl_option: []
mysql:
server:
database:
@@ -9,7 +11,9 @@
password: '${_param:mysql_neutron_password}'
host: '%'
rights: 'all'
+ ssl_option: ${_param:mysql_neutron_ssl_option}
- name: 'neutron'
password: '${_param:mysql_neutron_password}'
host: '${_param:cluster_local_address}'
rights: 'all'
+ ssl_option: ${_param:mysql_neutron_ssl_option}
diff --git a/galera/server/database/nova.yml b/galera/server/database/nova.yml
index 86d4821..d2ffc4a 100644
--- a/galera/server/database/nova.yml
+++ b/galera/server/database/nova.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mysql_nova_ssl_option: []
mysql:
server:
database:
@@ -9,10 +11,12 @@
password: ${_param:mysql_nova_password}
host: '%'
rights: all
+ ssl_option: ${_param:mysql_nova_ssl_option}
- name: nova
password: ${_param:mysql_nova_password}
host: ${_param:cluster_local_address}
rights: all
+ ssl_option: ${_param:mysql_nova_ssl_option}
nova_api:
encoding: utf8
users:
@@ -20,10 +24,12 @@
password: ${_param:mysql_nova_password}
host: '%'
rights: all
+ ssl_option: ${_param:mysql_nova_ssl_option}
- name: nova
password: ${_param:mysql_nova_password}
host: ${_param:cluster_local_address}
rights: all
+ ssl_option: ${_param:mysql_nova_ssl_option}
nova_cell0:
encoding: utf8
users:
@@ -31,7 +37,9 @@
password: ${_param:mysql_nova_password}
host: '%'
rights: all
+ ssl_option: ${_param:mysql_nova_ssl_option}
- name: nova
password: ${_param:mysql_nova_password}
host: ${_param:cluster_local_address}
rights: all
+ ssl_option: ${_param:mysql_nova_ssl_option}
diff --git a/galera/server/database/octavia.yml b/galera/server/database/octavia.yml
index dfefb9c..7b4eaaf 100644
--- a/galera/server/database/octavia.yml
+++ b/galera/server/database/octavia.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mysql_octavia_ssl_option: []
mysql:
server:
database:
@@ -9,7 +11,9 @@
password: '${_param:mysql_octavia_password}'
host: '%'
rights: 'all'
+ ssl_option: ${_param:mysql_octavia_ssl_option}
- name: 'octavia'
password: '${_param:mysql_octavia_password}'
host: '${_param:cluster_local_address}'
rights: 'all'
+ ssl_option: ${_param:mysql_octavia_ssl_option}
diff --git a/galera/server/database/panko.yml b/galera/server/database/panko.yml
index 7a3ed63..c4c455a 100644
--- a/galera/server/database/panko.yml
+++ b/galera/server/database/panko.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mysql_panko_ssl_option: []
mysql:
server:
database:
@@ -9,7 +11,9 @@
password: ${_param:mysql_panko_password}
host: '%'
rights: all
+ ssl_option: ${_param:mysql_panko_ssl_option}
- name: panko
password: ${_param:mysql_panko_password}
host: ${_param:cluster_local_address}
rights: all
+ ssl_option: ${_param:mysql_panko_ssl_option}
diff --git a/haproxy/proxy/listen/kubernetes/apiserver.yml b/haproxy/proxy/listen/kubernetes/apiserver.yml
index 8dfcb35..950765f 100644
--- a/haproxy/proxy/listen/kubernetes/apiserver.yml
+++ b/haproxy/proxy/listen/kubernetes/apiserver.yml
@@ -4,8 +4,6 @@
listen:
k8s_secure:
type: kubernetes
- options:
- - ssl-hello-chk
binds:
- address: ${_param:cluster_vip_address}
port: 443
@@ -13,15 +11,15 @@
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
port: 6443
- params: check
+ params: check check-ssl verify none
- name: ${_param:cluster_node02_hostname}
host: ${_param:cluster_node02_address}
port: 6443
- params: check
+ params: check check-ssl verify none
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 6443
- params: check
+ params: check check-ssl verify none
timeout:
server: 10m
client: 10m
diff --git a/helm/analytics_pipeline/hdfs.yml b/helm/analytics_pipeline/hdfs.yml
index 64e0cef..2b1382b 100644
--- a/helm/analytics_pipeline/hdfs.yml
+++ b/helm/analytics_pipeline/hdfs.yml
@@ -1,7 +1,7 @@
parameters:
_param:
analytics_hdfs_release: ${_param:analytics_release_prefix}hdfs
- analytics_hdfs_address: hdfs-namenode-${_param:analytics_hdfs_release}-0.hdfs-namenode-${_param:analytics_hdfs_release}
+ analytics_hdfs_address: hdfs-namenode-${_param:analytics_hdfs_release}-0.hdfs-namenode-${_param:analytics_hdfs_release}:8020
helm:
client:
releases:
diff --git a/helm/analytics_pipeline/kafka.yml b/helm/analytics_pipeline/kafka.yml
index 3c88299..3911bd0 100644
--- a/helm/analytics_pipeline/kafka.yml
+++ b/helm/analytics_pipeline/kafka.yml
@@ -14,4 +14,5 @@
antiAffinity: soft
zookeeper:
deployChart: false
- externalAddress: ${_param:analytics_zookeeper_address}
+ addresses:
+ zookeeper: ${_param:analytics_zookeeper_address}
diff --git a/helm/analytics_pipeline/spark.yml b/helm/analytics_pipeline/spark.yml
index aeb2856..5533df5 100644
--- a/helm/analytics_pipeline/spark.yml
+++ b/helm/analytics_pipeline/spark.yml
@@ -1,7 +1,7 @@
parameters:
_param:
analytics_spark_release: ${_param:analytics_release_prefix}spark
- analytics_spark_address: spark-master-${_param:analytics_spark_release}-0.spark-master-${_param:analytics_spark_release}:7077,spark-master-${_param:analytics_spark_release}-1.spark-master-${_param:analytics_spark_release}:7077
+ analytics_spark_address: spark-master-${_param:analytics_spark_release}-0:7077
helm:
client:
releases:
@@ -17,4 +17,5 @@
replicas: 3
zookeeper:
deployChart: false
- externalAddress: ${_param:analytics_zookeeper_address}
+ addresses:
+ zookeeper: ${_param:analytics_zookeeper_address}
diff --git a/helm/analytics_pipeline/tweepub.yml b/helm/analytics_pipeline/tweepub.yml
index 42678a3..daa62ca 100644
--- a/helm/analytics_pipeline/tweepub.yml
+++ b/helm/analytics_pipeline/tweepub.yml
@@ -19,5 +19,6 @@
locations: -71.4415,41.9860,-70.4747,42.9041,-122.75,36.8,-121.75,37.8,-74,40,-73,41
kafka:
deployChart: false
- externalAddress: ${_param:analytics_kafka_address}
topic: twitter-stream
+ addresses:
+ kafka: ${_param:analytics_kafka_address}
diff --git a/helm/analytics_pipeline/tweetics.yml b/helm/analytics_pipeline/tweetics.yml
index de438bf..0a6bebb 100644
--- a/helm/analytics_pipeline/tweetics.yml
+++ b/helm/analytics_pipeline/tweetics.yml
@@ -12,16 +12,20 @@
minHashtagCounts: 0
zookeeper:
deployChart: false
- externalAddress: ${_param:analytics_zookeeper_address}
+ addresses:
+ zookeeper: ${_param:analytics_zookeeper_address}
kafka:
deployChart: false
- externalAddress: ${_param:analytics_kafka_address}
topic: twitter-stream
+ addresses:
+ kafka: ${_param:analytics_kafka_address}
spark:
deployChart: false
- externalAddress: ${_param:analytics_spark_address}
+ addresses:
+ spark: ${_param:analytics_spark_address}
storage: hdfs
hdfs:
deployChart: false
- externalAddress: ${_param:analytics_hdfs_address}
path: /twitter
+ addresses:
+ namenode: ${_param:analytics_hdfs_address}
diff --git a/helm/analytics_pipeline/tweeviz.yml b/helm/analytics_pipeline/tweeviz.yml
index d8f7aef..e264031 100644
--- a/helm/analytics_pipeline/tweeviz.yml
+++ b/helm/analytics_pipeline/tweeviz.yml
@@ -14,6 +14,6 @@
storage: hdfs
hdfs:
deployChart: false
- externalAddress: ${_param:analytics_hdfs_address}
path: /
- externalPort: 8020
+ addresses:
+ namenode: ${_param:analytics_hdfs_address}
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index 2c6528f..dfcf9ac 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -140,3 +140,4 @@
- method hudson.model.Actionable getAction java.lang.Class
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods toSorted java.lang.Iterable
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods intersect java.util.List java.lang.Iterable
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods reverse java.util.List
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index 7b0dc68..d29fc5e 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -170,6 +170,9 @@
- name: magnum
upload_source_package: false
dist: trusty
+ - name: manila
+ upload_source_package: false
+ dist: trusty
- name: memcached
upload_source_package: false
dist: trusty
@@ -488,6 +491,9 @@
- name: magnum
upload_source_package: true
dist: xenial
+ - name: manila
+ upload_source_package: true
+ dist: xenial
- name: memcached
upload_source_package: true
dist: xenial
diff --git a/jenkins/client/job/deploy/k8s_control.yml b/jenkins/client/job/deploy/k8s_control.yml
index f851176..4dba2e7 100644
--- a/jenkins/client/job/deploy/k8s_control.yml
+++ b/jenkins/client/job/deploy/k8s_control.yml
@@ -8,7 +8,7 @@
display_name: "Deploy - k8s control"
discard:
build:
- keep_num: 20
+ keep_num: 50
concurrent: false
scm:
type: git
diff --git a/jenkins/client/job/deploy/kqueen.yml b/jenkins/client/job/deploy/kqueen.yml
index 817eb8f..06b449b 100644
--- a/jenkins/client/job/deploy/kqueen.yml
+++ b/jenkins/client/job/deploy/kqueen.yml
@@ -7,7 +7,7 @@
type: workflow-scm
discard:
build:
- keep_num: 20
+ keep_num: 50
concurrent: true
display_name: "Deploy AWS K8S using kqueen"
scm:
diff --git a/jenkins/client/job/deploy/lab/cleanup.yml b/jenkins/client/job/deploy/lab/cleanup.yml
index 93a0818..0db6463 100644
--- a/jenkins/client/job/deploy/lab/cleanup.yml
+++ b/jenkins/client/job/deploy/lab/cleanup.yml
@@ -8,7 +8,7 @@
display_name: "Deploy - stack cleanup"
discard:
build:
- keep_num: 20
+ keep_num: 50
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
@@ -59,7 +59,7 @@
default: "aws-credentials"
AWS_DEFAULT_REGION:
type: string
- default: "us-west-2"
+ default: "eu-central-1"
delete-failed-stacks:
type: workflow-scm
diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index b6bbc71..9a04876 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -11,7 +11,7 @@
type: workflow-scm
discard:
build:
- keep_num: 20
+ keep_num: 100
concurrent: true
display_name: "Deploy - {{stack_name}} {{stack_type}}"
scm:
@@ -100,7 +100,7 @@
description: "Formulas revision to install on Salt Master bootstrap stage"
EXTRA_FORMULAS:
type: string
- default: "maas memcached ntp nginx collectd sensu heka sphinx mysql grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal rsync docker keepalived aptly jenkins gerrit artifactory influxdb horizon ceph"
+ default: ""
STATIC_MGMT_NETWORK:
type: boolean
default: 'false'
@@ -180,3 +180,32 @@
description: "Run tests matched to pattern only"
default: ""
+ # TestRail vars
+ TESTRAIL_REPORT:
+ type: boolean
+ description: "Report test results to TestRail if true"
+ default: "false"
+ TESTRAIL_REPORTER_IMAGE:
+ type: string
+ description: "Testrail reporter docker image"
+ default: "alrem/xunit2testrail"
+ TESTRAIL_QA_CREDENTIALS:
+ type: string
+ description: "Credentials for results upload to testrail"
+ default: "oscore-qa-credentials"
+ TESTRAIL_MILESTONE:
+ type: string
+ description: "TestRail milestone"
+ default: "MCP1.1"
+ TESTRAIL_PLAN:
+ type: string
+ description: "TestRail test plan name. Will be generated if missing."
+ default: ""
+ TESTRAIL_GROUP:
+ type: string
+ description: "TestRail test group name."
+ default: "{{stack_name}}"
+ TESTRAIL_SUITE:
+ type: string
+ description: "TestRail test suite name"
+ default: "Tempest 16.0.0 with designate tests"
diff --git a/jenkins/client/job/deploy/lab/release/mcp11.yml b/jenkins/client/job/deploy/lab/release/mcp11.yml
index 8e61e8e..5c0f4d4 100644
--- a/jenkins/client/job/deploy/lab/release/mcp11.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp11.yml
@@ -9,7 +9,7 @@
stack_type: heat
stack_test: ""
job_timer: ""
- - stack_name: virtual_mcp11_ovs_dvr
+ - stack_name: virtual_mcp11_dvr
stack_env: devcloud_virtual_mcp11_dvr
stack_install: core,openstack,dvr
stack_type: heat
diff --git a/jenkins/client/job/deploy/openstack.yml b/jenkins/client/job/deploy/openstack.yml
index 2e89659..d9b1c29 100644
--- a/jenkins/client/job/deploy/openstack.yml
+++ b/jenkins/client/job/deploy/openstack.yml
@@ -10,7 +10,7 @@
display_name: "Deploy - OpenStack"
discard:
build:
- keep_num: 20
+ keep_num: 50
concurrent: true
scm:
type: git
diff --git a/jenkins/client/job/deploy/test.yml b/jenkins/client/job/deploy/test.yml
index c226fbc..acf6fa3 100644
--- a/jenkins/client/job/deploy/test.yml
+++ b/jenkins/client/job/deploy/test.yml
@@ -7,7 +7,7 @@
type: workflow-scm
discard:
build:
- keep_num: 20
+ keep_num: 50
concurrent: true
display_name: "Deploy - Test services in environment"
scm:
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
index 8490ee7..36e1dc0 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
@@ -8,7 +8,7 @@
display_name: "Kubernetes tests pipeline"
discard:
build:
- keep_num: 20
+ keep_num: 50
concurrent: false
scm:
type: git
diff --git a/jenkins/client/job/opencontrail/build/generic.yml b/jenkins/client/job/opencontrail/build/generic.yml
index 699222e..d9be124 100644
--- a/jenkins/client/job/opencontrail/build/generic.yml
+++ b/jenkins/client/job/opencontrail/build/generic.yml
@@ -53,7 +53,7 @@
branch: R3.2
ppa: mirantis-opencontrail/opencontrail-3.2
upload_source_package: true
- dpdk: contrail_dpdk_2_1
+ dpdk: contrail_dpdk_17_02
build_trigger: ""
- buildname: oc32
os: ubuntu
@@ -61,7 +61,7 @@
branch: R3.2
ppa: mirantis-opencontrail/opencontrail-3.2
upload_source_package: true
- dpdk: contrail_dpdk_2_1
+ dpdk: contrail_dpdk_17_02
build_trigger: ""
- buildname: oc323
os: ubuntu
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 06060bd..fdb7401 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -654,7 +654,7 @@
trigger:
gerrit:
project:
- "^salt-formulas/(nova|cinder|glance|keystone|horizon|neutron|designate|heat|ironic|barbican)$":
+ "^salt-formulas/(nova|cinder|glance|keystone|horizon|neutron|designate|heat|ironic|barbican|salt|linux|reclass|galera)$":
compare_type: 'REG_EXP'
branches:
- master
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index 87f1b89..25a1b84 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -49,6 +49,8 @@
branches: ${_param:salt_formulas_branches}
- name: dekapod
branches: ${_param:salt_formulas_branches}
+ - name: debmirror
+ branches: ${_param:salt_formulas_branches}
- name: devops-portal
branches: ${_param:salt_formulas_branches}
- name: docker
@@ -131,6 +133,8 @@
branches: ${_param:salt_formulas_branches}
- name: magnum
branches: ${_param:salt_formulas_branches}
+ - name: manila
+ branches: ${_param:salt_formulas_branches}
- name: memcached
branches: ${_param:salt_formulas_branches}
- name: midonet
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 3dd77bf..6425773 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -70,6 +70,7 @@
- name: logrotate
- name: maas
- name: magnum
+ - name: manila
- name: memcached
- name: midonet
- name: mirascan
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 879a1f1..6bf8e5a 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -8,6 +8,11 @@
name: test-salt-model-{{name}}
template:
type: workflow-scm
+ discard:
+ build:
+ keep_num: 50
+ artifact:
+ keep_num: 50
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
@@ -81,6 +86,11 @@
name: test-salt-model-{{name}}
template:
type: workflow-scm
+ discard:
+ build:
+ keep_num: 50
+ artifact:
+ keep_num: 50
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
@@ -119,9 +129,9 @@
template:
discard:
build:
- keep_num: 20
+ keep_num: 50
artifact:
- keep_num: 20
+ keep_num: 50
type: workflow-scm
concurrent: true
scm:
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index ab2dd38..7d2fa9b 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -15,9 +15,9 @@
display_name: "Validate - Openstack"
discard:
build:
- keep_num: 20
+ keep_num: 50
artifact:
- keep_num: 20
+ keep_num: 50
concurrent: false
scm:
type: git
diff --git a/jenkins/slave/debmirror.yml b/jenkins/slave/debmirror.yml
new file mode 100644
index 0000000..6cd7829
--- /dev/null
+++ b/jenkins/slave/debmirror.yml
@@ -0,0 +1,8 @@
+classes:
+ - system.jenkins.slave
+parameters:
+ linux:
+ system:
+ package:
+ debmirror:
+ version: latest
diff --git a/keystone/client/core.yml b/keystone/client/core.yml
index 39d28de..f869059 100644
--- a/keystone/client/core.yml
+++ b/keystone/client/core.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ keystone_service_protocol: http
linux:
system:
job:
@@ -16,6 +18,7 @@
host: ${_param:keystone_service_host}
port: 35357
token: ${_param:keystone_service_token}
+ protocol: ${_param:keystone_service_protocol}
roles:
- admin
- Member
@@ -38,3 +41,4 @@
port: 5000
region_name: ${_param:openstack_region}
use_keystoneauth: true
+ protocol: ${_param:keystone_service_protocol}
diff --git a/keystone/client/image_manager.yml b/keystone/client/image_manager.yml
index 024b0c4..becd512 100644
--- a/keystone/client/image_manager.yml
+++ b/keystone/client/image_manager.yml
@@ -1,6 +1,7 @@
parameters:
_param:
keystone_image_manager_email: 'root@localhost'
+ keystone_service_protocol: http
keystone:
client:
enabled: true
@@ -10,6 +11,7 @@
host: ${_param:keystone_service_host}
port: 35357
token: ${_param:keystone_service_token}
+ protocol: ${_param:keystone_service_protocol}
roles:
- image_manager
project:
diff --git a/keystone/client/service/aodh.yml b/keystone/client/service/aodh.yml
index 51de0ca..c4d49b8 100644
--- a/keystone/client/service/aodh.yml
+++ b/keystone/client/service/aodh.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ aodh_service_protocol: http
keystone:
client:
server:
@@ -25,6 +26,8 @@
internal_address: ${_param:aodh_service_host}
internal_port: 8042
internal_path: '/'
+ internal_protocol: ${_param:aodh_service_protocol}
+ admin_protocol: ${_param:aodh_service_protocol}
admin_address: ${_param:aodh_service_host}
admin_port: 8042
admin_path: '/'
diff --git a/keystone/client/service/barbican.yml b/keystone/client/service/barbican.yml
index 497eb50..d222fb6 100644
--- a/keystone/client/service/barbican.yml
+++ b/keystone/client/service/barbican.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ barbican_service_protocol: http
keystone:
client:
server:
@@ -31,6 +32,8 @@
internal_address: ${_param:barbican_service_host}
internal_port: 9311
internal_path: '/'
+ internal_protocol: ${_param:barbican_service_protocol}
admin_address: ${_param:barbican_service_host}
admin_port: 9311
admin_path: '/'
+ admin_protocol: ${_param:barbican_service_protocol}
diff --git a/keystone/client/service/billometer.yml b/keystone/client/service/billometer.yml
index 3728aa5..6100dc9 100644
--- a/keystone/client/service/billometer.yml
+++ b/keystone/client/service/billometer.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ billometer_service_protocol: http
keystone:
client:
server:
@@ -25,6 +26,8 @@
internal_address: ${_param:billometer_service_host}
internal_port: 9753
internal_path: '/v1'
+ internal_protocol: ${_param:billometer_service_protocol}
+ admin_protocol: ${_param:billometer_service_protocol}
admin_address: ${_param:billometer_service_host}
admin_port: 9753
admin_path: '/v1'
diff --git a/keystone/client/service/ceilometer.yml b/keystone/client/service/ceilometer.yml
index 4c59f80..90e0d3e 100644
--- a/keystone/client/service/ceilometer.yml
+++ b/keystone/client/service/ceilometer.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ ceilometer_service_protocol: http
keystone:
client:
server:
@@ -25,6 +26,8 @@
internal_address: ${_param:ceilometer_service_host}
internal_port: 8777
internal_path: '/'
+ internal_protocol: ${_param:ceilometer_service_protocol}
+ admin_protocol: ${_param:ceilometer_service_protocol}
admin_address: ${_param:ceilometer_service_host}
admin_port: 8777
admin_path: '/'
diff --git a/keystone/client/service/cinder.yml b/keystone/client/service/cinder.yml
index ffb5510..64705e3 100644
--- a/keystone/client/service/cinder.yml
+++ b/keystone/client/service/cinder.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ cinder_service_protocol: http
keystone:
client:
server:
@@ -25,6 +26,8 @@
internal_address: ${_param:cinder_service_host}
internal_port: 8776
internal_path: '/v1/$(project_id)s'
+ internal_protocol: ${_param:cinder_service_protocol}
+ admin_protocol: ${_param:cinder_service_protocol}
admin_address: ${_param:cinder_service_host}
admin_port: 8776
admin_path: '/v1/$(project_id)s'
diff --git a/keystone/client/service/cinder2.yml b/keystone/client/service/cinder2.yml
index e0e2636..cb289e1 100644
--- a/keystone/client/service/cinder2.yml
+++ b/keystone/client/service/cinder2.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ cinder_service_protocol: http
keystone:
client:
server:
@@ -25,6 +26,8 @@
internal_address: ${_param:cinder_service_host}
internal_port: 8776
internal_path: '/v2/$(project_id)s'
+ internal_protocol: ${_param:cinder_service_protocol}
+ admin_protocol: ${_param:cinder_service_protocol}
admin_address: ${_param:cinder_service_host}
admin_port: 8776
admin_path: '/v2/$(project_id)s'
diff --git a/keystone/client/service/cinder3.yml b/keystone/client/service/cinder3.yml
index 43a805c..d5e0ae1 100644
--- a/keystone/client/service/cinder3.yml
+++ b/keystone/client/service/cinder3.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ cinder_service_protocol: http
keystone:
client:
server:
@@ -25,6 +26,8 @@
internal_address: ${_param:cinder_service_host}
internal_port: 8776
internal_path: '/v3/$(project_id)s'
+ internal_protocol: ${_param:cinder_service_protocol}
+ admin_protocol: ${_param:cinder_service_protocol}
admin_address: ${_param:cinder_service_host}
admin_port: 8776
admin_path: '/v3/$(project_id)s'
diff --git a/keystone/client/service/congress.yml b/keystone/client/service/congress.yml
index 529d3ee..49e8337 100644
--- a/keystone/client/service/congress.yml
+++ b/keystone/client/service/congress.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ congress_service_protocol: http
keystone:
client:
server:
@@ -25,6 +26,8 @@
internal_address: ${_param:congress_service_host}
internal_port: 1789
internal_path: '/'
+ internal_protocol: ${_param:congress_service_protocol}
+ admin_protocol: ${_param:congress_service_protocol}
admin_address: ${_param:congress_service_host}
admin_port: 1789
admin_path: '/'
diff --git a/keystone/client/service/designate.yml b/keystone/client/service/designate.yml
index 4018712..75a588e 100644
--- a/keystone/client/service/designate.yml
+++ b/keystone/client/service/designate.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ designate_service_protocol: http
keystone:
client:
server:
@@ -25,6 +26,8 @@
internal_address: ${_param:designate_service_host}
internal_port: 9001
internal_path: '/'
+ internal_protocol: ${_param:designate_service_protocol}
+ admin_protocol: ${_param:designate_service_protocol}
admin_address: ${_param:designate_service_host}
admin_port: 9001
admin_path: '/'
diff --git a/keystone/client/service/glance.yml b/keystone/client/service/glance.yml
index 365917b..3c0db9c 100644
--- a/keystone/client/service/glance.yml
+++ b/keystone/client/service/glance.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ glance_service_protocol: http
keystone:
client:
server:
@@ -25,6 +26,8 @@
internal_address: ${_param:glance_service_host}
internal_port: 9292
internal_path: ''
+ internal_protocol: ${_param:glance_service_protocol}
+ admin_protocol: ${_param:glance_service_protocol}
admin_address: ${_param:glance_service_host}
admin_port: 9292
admin_path: ''
diff --git a/keystone/client/service/glare.yml b/keystone/client/service/glare.yml
index 78c7d1f..4534b0e 100644
--- a/keystone/client/service/glare.yml
+++ b/keystone/client/service/glare.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ glare_service_protocol: http
keystone:
client:
server:
@@ -25,6 +26,8 @@
internal_address: ${_param:glance_service_host}
internal_port: 9494
internal_path: ''
+ internal_protocol: ${_param:glare_service_protocol}
+ admin_protocol: ${_param:glare_service_protocol}
admin_address: ${_param:glance_service_host}
admin_port: 9494
admin_path: ''
diff --git a/keystone/client/service/heat-cfn.yml b/keystone/client/service/heat-cfn.yml
index 343ff46..1a2486a 100644
--- a/keystone/client/service/heat-cfn.yml
+++ b/keystone/client/service/heat-cfn.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ heat_service_protocol: http
keystone:
client:
server:
@@ -18,6 +19,8 @@
internal_address: ${_param:heat_service_host}
internal_port: 8000
internal_path: '/v1'
+ internal_protocol: ${_param:heat_service_protocol}
+ admin_protocol: ${_param:heat_service_protocol}
admin_address: ${_param:heat_service_host}
admin_port: 8000
admin_path: '/v1'
diff --git a/keystone/client/service/heat.yml b/keystone/client/service/heat.yml
index d7eadd5..c8882dd 100644
--- a/keystone/client/service/heat.yml
+++ b/keystone/client/service/heat.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ heat_service_protocol: http
keystone:
client:
server:
@@ -28,6 +29,8 @@
internal_address: ${_param:heat_service_host}
internal_port: 8004
internal_path: '/v1/%(project_id)s'
+ internal_protocol: ${_param:heat_service_protocol}
+ admin_protocol: ${_param:heat_service_protocol}
admin_address: ${_param:heat_service_host}
admin_port: 8004
admin_path: '/v1/%(project_id)s'
diff --git a/keystone/client/service/ironic.yml b/keystone/client/service/ironic.yml
index 1ab9872..e4c384c 100644
--- a/keystone/client/service/ironic.yml
+++ b/keystone/client/service/ironic.yml
@@ -1,6 +1,8 @@
parameters:
_param:
cluster_public_protocol: https
+ keystone_service_protocol: http
+ ironic_service_protocol: http
keystone:
client:
server:
@@ -25,6 +27,8 @@
internal_address: ${_param:ironic_service_host}
internal_port: 6385
internal_path: ''
+ internal_protocol: ${_param:ironic_service_protocol}
+ admin_protocol: ${_param:ironic_service_protocol}
admin_address: ${_param:ironic_service_host}
admin_port: 6385
admin_path: ''
@@ -36,3 +40,4 @@
host: ${_param:keystone_service_host}
port: 5000
region_name: ${_param:openstack_region}
+ protocol: ${_param:keystone_service_protocol}
diff --git a/keystone/client/service/keystone.yml b/keystone/client/service/keystone.yml
index af3acfc..d9092e0 100644
--- a/keystone/client/service/keystone.yml
+++ b/keystone/client/service/keystone.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ keystone_service_protocol: http
keystone:
client:
server:
@@ -18,6 +19,8 @@
internal_address: ${_param:keystone_service_host}
internal_port: 5000
internal_path: '/v2.0'
+ internal_protocol: ${_param:keystone_service_protocol}
admin_address: ${_param:keystone_service_host}
admin_port: 35357
admin_path: '/v2.0'
+ admin_protocol: ${_param:keystone_service_protocol}
diff --git a/keystone/client/service/keystone3.yml b/keystone/client/service/keystone3.yml
index bd0c63b..5138c4f 100644
--- a/keystone/client/service/keystone3.yml
+++ b/keystone/client/service/keystone3.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ keystone_service_protocol: http
keystone:
client:
server:
@@ -18,6 +19,8 @@
internal_address: ${_param:keystone_service_host}
internal_port: 5000
internal_path: '/v3'
+ internal_protocol: ${_param:keystone_service_protocol}
admin_address: ${_param:keystone_service_host}
admin_port: 35357
admin_path: '/v2.0'
+ admin_protocol: ${_param:keystone_service_protocol}
diff --git a/keystone/client/service/murano.yml b/keystone/client/service/murano.yml
index 5e65038..e6c70f1 100644
--- a/keystone/client/service/murano.yml
+++ b/keystone/client/service/murano.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ murano_service_protocol: http
keystone:
client:
server:
@@ -25,6 +26,8 @@
internal_address: ${_param:murano_service_host}
internal_port: 8082
internal_path: ''
+ internal_protocol: ${_param:murano_service_protocol}
+ admin_protocol: ${_param:murano_service_protocol}
admin_address: ${_param:murano_service_host}
admin_port: 8082
admin_path: ''
diff --git a/keystone/client/service/neutron.yml b/keystone/client/service/neutron.yml
index 12fe9fe..8bec7f2 100644
--- a/keystone/client/service/neutron.yml
+++ b/keystone/client/service/neutron.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ neutron_service_protocol: http
keystone:
client:
server:
@@ -25,6 +26,8 @@
internal_address: ${_param:neutron_service_host}
internal_port: 9696
internal_path: '/'
+ internal_protocol: ${_param:neutron_service_protocol}
+ admin_protocol: ${_param:neutron_service_protocol}
admin_address: ${_param:neutron_service_host}
admin_port: 9696
admin_path: '/'
diff --git a/keystone/client/service/nova-placement.yml b/keystone/client/service/nova-placement.yml
index 61b5455..3ed0654 100644
--- a/keystone/client/service/nova-placement.yml
+++ b/keystone/client/service/nova-placement.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ nova_service_protocol: http
keystone:
client:
server:
@@ -18,6 +19,8 @@
internal_address: ${_param:nova_service_host}
internal_port: '8778'
internal_path: ''
+ internal_protocol: ${_param:nova_service_protocol}
+ admin_protocol: ${_param:nova_service_protocol}
admin_address: ${_param:nova_service_host}
admin_port: '8778'
admin_path: ''
diff --git a/keystone/client/service/nova.yml b/keystone/client/service/nova.yml
index a0d698b..ca20106 100644
--- a/keystone/client/service/nova.yml
+++ b/keystone/client/service/nova.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ nova_service_protocol: http
keystone:
client:
server:
@@ -25,6 +26,8 @@
internal_address: ${_param:nova_service_host}
internal_port: 8774
internal_path: '/v2/$(project_id)s'
+ internal_protocol: ${_param:nova_service_protocol}
+ admin_protocol: ${_param:nova_service_protocol}
admin_address: ${_param:nova_service_host}
admin_port: 8774
admin_path: '/v2/$(project_id)s'
diff --git a/keystone/client/service/nova21.yml b/keystone/client/service/nova21.yml
index 328aefd..2782ec2 100644
--- a/keystone/client/service/nova21.yml
+++ b/keystone/client/service/nova21.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ nova_service_protocol: http
keystone:
client:
server:
@@ -25,6 +26,8 @@
internal_address: ${_param:nova_service_host}
internal_port: 8774
internal_path: '/v2/$(project_id)s'
+ internal_protocol: ${_param:nova_service_protocol}
+ admin_protocol: ${_param:nova_service_protocol}
admin_address: ${_param:nova_service_host}
admin_port: 8774
admin_path: '/v2/$(project_id)s'
@@ -40,6 +43,8 @@
internal_address: ${_param:nova_service_host}
internal_port: 8774
internal_path: '/v2.1/$(project_id)s'
+ internal_protocol: ${_param:nova_service_protocol}
+ admin_protocol: ${_param:nova_service_protocol}
admin_address: ${_param:nova_service_host}
admin_port: 8774
admin_path: '/v2.1/$(project_id)s'
diff --git a/keystone/client/service/octavia.yml b/keystone/client/service/octavia.yml
index 0382345..c08312e 100644
--- a/keystone/client/service/octavia.yml
+++ b/keystone/client/service/octavia.yml
@@ -1,6 +1,8 @@
parameters:
_param:
cluster_public_protocol: https
+ keystone_service_protocol: http
+ octavia_service_protocol: http
keystone:
client:
server:
@@ -25,6 +27,8 @@
internal_address: ${_param:octavia_service_host}
internal_port: 9876
internal_path: '/'
+ internal_protocol: ${_param:octavia_service_protocol}
+ admin_protocol: ${_param:octavia_service_protocol}
admin_address: ${_param:octavia_service_host}
admin_port: 9876
admin_path: '/'
@@ -37,3 +41,4 @@
port: 5000
region_name: ${_param:openstack_region}
use_keystoneauth: true
+ protocol: ${_param:keystone_service_protocol}
diff --git a/keystone/client/service/radosgw-s3.yml b/keystone/client/service/radosgw-s3.yml
index 06d8299..c97c812 100644
--- a/keystone/client/service/radosgw-s3.yml
+++ b/keystone/client/service/radosgw-s3.yml
@@ -2,6 +2,7 @@
_param:
cluster_public_protocol: https
radosgw_s3_cluster_port: 8081
+ radosgw_service_protocol: http
keystone:
client:
server:
@@ -26,6 +27,8 @@
internal_address: ${_param:radosgw_service_host}
internal_port: ${_param:radosgw_s3_cluster_port}
internal_path: '/'
+ internal_protocol: ${_param:radosgw_service_protocol}
+ admin_protocol: ${_param:radosgw_service_protocol}
admin_address: ${_param:radosgw_service_host}
admin_port: ${_param:radosgw_s3_cluster_port}
admin_path: '/'
diff --git a/keystone/client/service/radosgw-swift.yml b/keystone/client/service/radosgw-swift.yml
index 3bf9b27..14a24af 100644
--- a/keystone/client/service/radosgw-swift.yml
+++ b/keystone/client/service/radosgw-swift.yml
@@ -2,6 +2,7 @@
_param:
cluster_public_protocol: https
radosgw_swift_cluster_port: 8081
+ radosgw_service_protocol: http
keystone:
client:
server:
@@ -26,6 +27,8 @@
internal_address: ${_param:radosgw_service_host}
internal_port: ${_param:radosgw_swift_cluster_port}
internal_path: '/swift/v1'
+ internal_protocol: ${_param:radosgw_service_protocol}
+ admin_protocol: ${_param:radosgw_service_protocol}
admin_address: ${_param:radosgw_service_host}
admin_port: ${_param:radosgw_swift_cluster_port}
admin_path: '/swift/v1'
diff --git a/keystone/client/service/sahara.yml b/keystone/client/service/sahara.yml
index 84a0b96..b635137 100644
--- a/keystone/client/service/sahara.yml
+++ b/keystone/client/service/sahara.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ sahara_internal_protocol: http
keystone:
client:
server:
@@ -25,6 +26,8 @@
internal_address: ${_param:sahara_service_host}
internal_port: 8386
internal_path: '/v1.1/%(project_id)s'
+ internal_protocol: ${_param:sahara_internal_protocol}
+ admin_protocol: ${_param:sahara_internal_protocol}
admin_address: ${_param:sahara_service_host}
admin_port: 8386
admin_path: '/v1.1/%(project_id)s'
diff --git a/keystone/client/service/swift-s3.yml b/keystone/client/service/swift-s3.yml
index 5880487c9..b2769a0 100644
--- a/keystone/client/service/swift-s3.yml
+++ b/keystone/client/service/swift-s3.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ swift_service_protocol: http
keystone:
client:
server:
@@ -26,6 +27,8 @@
internal_address: ${_param:swift_service_host}
internal_port: 8080
internal_path: '/v1/AUTH_%(project_id)s'
+ internal_protocol: ${_param:swift_service_protocol}
+ admin_protocol: ${_param:swift_service_protocol}
admin_address: ${_param:swift_service_host}
admin_port: 8080
admin_path: '/'
diff --git a/keystone/client/service/swift.yml b/keystone/client/service/swift.yml
index 781fab9..6f558fb 100644
--- a/keystone/client/service/swift.yml
+++ b/keystone/client/service/swift.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ swift_service_protocol: http
keystone:
client:
server:
@@ -25,6 +26,8 @@
internal_address: ${_param:swift_service_host}
internal_port: 8080
internal_path: '/v1/AUTH_%(project_id)s'
+ internal_protocol: ${_param:swift_service_protocol}
+ admin_protocol: ${_param:swift_service_protocol}
admin_address: ${_param:swift_service_host}
admin_port: 8080
admin_path: '/'
diff --git a/keystone/client/single.yml b/keystone/client/single.yml
index ebf5b5f..a79ed7e 100644
--- a/keystone/client/single.yml
+++ b/keystone/client/single.yml
@@ -7,6 +7,8 @@
- system.keystone.client.service.keystone
- system.keystone.client.service.neutron
parameters:
+ _param:
+ keystone_service_protocol: http
linux:
system:
job:
@@ -24,6 +26,7 @@
host: ${_param:keystone_service_host}
port: 35357
token: ${_param:keystone_service_token}
+ protocol: ${_param:keystone_service_protocol}
roles:
- admin
- Member
@@ -46,3 +49,4 @@
port: 5000
region_name: ${_param:openstack_region}
use_keystoneauth: true
+ protocol: ${_param:keystone_service_protocol}
diff --git a/keystone/server/wsgi.yml b/keystone/server/wsgi.yml
index f62c1cc..333cb76 100644
--- a/keystone/server/wsgi.yml
+++ b/keystone/server/wsgi.yml
@@ -1,6 +1,10 @@
classes:
- system.apache.server.single
parameters:
+ _param:
+ apache_keystone_ssl:
+ enabled: false
+ apache_keystone_api_host: ${linux:network:fqdn}
keystone:
server:
service_name: apache2
@@ -14,7 +18,8 @@
type: keystone
name: wsgi
host:
- name: ${linux:network:fqdn}
+ name: ${_param:apache_keystone_api_host}
+ ssl: ${_param:apache_keystone_ssl}
log:
custom:
format: >-
diff --git a/neutron/control/ovn/single.yml b/neutron/control/ovn/single.yml
index c02f621..92b8258 100644
--- a/neutron/control/ovn/single.yml
+++ b/neutron/control/ovn/single.yml
@@ -32,6 +32,11 @@
message_queue:
members:
- host: ${_param:openstack_message_queue_node01_address}
+ ovn_ctl_opts:
+ db-nb-create-insecure-remote: 'yes'
+ db-sb-create-insecure-remote: 'yes'
+ db-nb-addr: ${_param:single_address}
+ db-sb-addr: ${_param:single_address}
mysql:
server:
database:
diff --git a/nginx/server/proxy/openstack/barbican.yml b/nginx/server/proxy/openstack/barbican.yml
index 5f658d1..89e5a9c 100644
--- a/nginx/server/proxy/openstack/barbican.yml
+++ b/nginx/server/proxy/openstack/barbican.yml
@@ -1,6 +1,8 @@
parameters:
_param:
nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
+ nginx_proxy_openstack_api_address: 0.0.0.0
+ nginx_proxy_openstack_barbican_host: ${_param:barbican_service_host}
nginx:
server:
enabled: true
@@ -11,10 +13,11 @@
name: openstack_api_barbican
check: false
proxy:
- host: ${_param:barbican_service_host}
+ host: ${_param:nginx_proxy_openstack_barbican_host}
port: 9311
protocol: http
host:
name: ${_param:nginx_proxy_openstack_api_host}
port: 9311
+ address: ${_param:nginx_proxy_openstack_api_address}
ssl: ${_param:nginx_proxy_ssl}
diff --git a/nginx/server/proxy/openstack/designate.yml b/nginx/server/proxy/openstack/designate.yml
index 29bc390..c238775 100644
--- a/nginx/server/proxy/openstack/designate.yml
+++ b/nginx/server/proxy/openstack/designate.yml
@@ -1,6 +1,8 @@
parameters:
_param:
nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
+ nginx_proxy_openstack_api_address: 0.0.0.0
+ nginx_proxy_openstack_designate_host: ${_param:designate_service_host}
nginx:
server:
enabled: true
@@ -10,10 +12,11 @@
type: nginx_proxy
name: openstack_api_designate
proxy:
- host: ${_param:nginx_proxy_openstack_api_proxy_host}
+ host: ${_param:nginx_proxy_openstack_designate_host}
port: 9001
protocol: http
host:
name: ${_param:nginx_proxy_openstack_api_host}
port: 9001
+ address: ${_param:nginx_proxy_openstack_api_address}
ssl: ${_param:nginx_proxy_ssl}
diff --git a/nginx/server/proxy/openstack/horizon.yml b/nginx/server/proxy/openstack/horizon.yml
index 13df5cb..03e3f3c 100644
--- a/nginx/server/proxy/openstack/horizon.yml
+++ b/nginx/server/proxy/openstack/horizon.yml
@@ -1,4 +1,8 @@
parameters:
+ _param:
+ nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
+ nginx_proxy_openstack_api_address: 0.0.0.0
+ nginx_proxy_openstack_horizon_host: ${_param:openstack_proxy_address}
nginx:
server:
enabled: true
@@ -8,11 +12,12 @@
type: nginx_proxy
name: horizon
proxy:
- host: ${_param:openstack_proxy_address}
+ host: ${_param:nginx_proxy_openstack_horizon_host}
port: 443
protocol: https
host:
- name: ${_param:cluster_public_host}
+ name: ${_param:nginx_proxy_openstack_api_host}
port: 443
protocol: https
+ address: ${_param:nginx_proxy_openstack_api_address}
ssl: ${_param:nginx_proxy_ssl}
diff --git a/nginx/server/proxy/openstack/placement.yml b/nginx/server/proxy/openstack/placement.yml
new file mode 100644
index 0000000..eda272c
--- /dev/null
+++ b/nginx/server/proxy/openstack/placement.yml
@@ -0,0 +1,22 @@
+parameters:
+ _param:
+ nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
+ nginx_proxy_openstack_api_address: 0.0.0.0
+ nginx_proxy_openstack_placement_host: ${_param:placement_service_host}
+ nginx:
+ server:
+ enabled: true
+ site:
+ nginx_proxy_openstack_api_placement:
+ enabled: true
+ type: nginx_proxy
+ name: openstack_api_placement
+ proxy:
+ host: ${_param:nginx_proxy_openstack_placement_host}
+ port: 8778
+ protocol: http
+ host:
+ name: ${_param:nginx_proxy_openstack_api_host}
+ port: 8778
+ address: ${_param:nginx_proxy_openstack_api_address}
+ ssl: ${_param:nginx_proxy_ssl}
diff --git a/nginx/server/proxy/openstack_api.yml b/nginx/server/proxy/openstack_api.yml
index 4b0b3f4..4f6073d 100644
--- a/nginx/server/proxy/openstack_api.yml
+++ b/nginx/server/proxy/openstack_api.yml
@@ -1,6 +1,13 @@
parameters:
_param:
nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
+ nginx_proxy_openstack_api_address: 0.0.0.0
+ nginx_proxy_openstack_keystone_host: ${_param:keystone_service_host}
+ nginx_proxy_openstack_nova_host: ${_param:nova_service_host}
+ nginx_proxy_openstack_cinder_host: ${_param:cinder_service_host}
+ nginx_proxy_openstack_glance_host: ${_param:glance_service_host}
+ nginx_proxy_openstack_neutron_host: ${_param:neutron_service_host}
+ nginx_proxy_openstack_heat_host: ${_param:heat_service_host}
nginx:
server:
enabled: true
@@ -11,12 +18,13 @@
name: openstack_api_keystone
check: false
proxy:
- host: ${_param:keystone_service_host}
+ host: ${_param:nginx_proxy_openstack_keystone_host}
port: 5000
protocol: http
host:
name: ${_param:nginx_proxy_openstack_api_host}
port: 5000
+ address: ${_param:nginx_proxy_openstack_api_address}
ssl: ${_param:nginx_proxy_ssl}
nginx_proxy_openstack_api_keystone_private:
enabled: true
@@ -24,12 +32,13 @@
name: openstack_api_keystone_private
check: false
proxy:
- host: ${_param:keystone_service_host}
+ host: ${_param:nginx_proxy_openstack_keystone_host}
port: 35357
protocol: http
host:
name: ${_param:nginx_proxy_openstack_api_host}
port: 35357
+ address: ${_param:nginx_proxy_openstack_api_address}
ssl: ${_param:nginx_proxy_ssl}
nginx_proxy_openstack_api_nova:
enabled: true
@@ -37,12 +46,13 @@
name: openstack_api_nova
check: false
proxy:
- host: ${_param:nova_service_host}
+ host: ${_param:nginx_proxy_openstack_nova_host}
port: 8774
protocol: http
host:
name: ${_param:nginx_proxy_openstack_api_host}
port: 8774
+ address: ${_param:nginx_proxy_openstack_api_address}
ssl: ${_param:nginx_proxy_ssl}
nginx_proxy_openstack_api_cinder:
enabled: true
@@ -50,12 +60,13 @@
name: openstack_api_cinder
check: false
proxy:
- host: ${_param:cinder_service_host}
+ host: ${_param:nginx_proxy_openstack_cinder_host}
port: 8776
protocol: http
host:
name: ${_param:nginx_proxy_openstack_api_host}
port: 8776
+ address: ${_param:nginx_proxy_openstack_api_address}
ssl: ${_param:nginx_proxy_ssl}
nginx_proxy_openstack_api_glance:
enabled: true
@@ -64,13 +75,14 @@
check: false
underscores_in_headers: true
proxy:
- host: ${_param:glance_service_host}
+ host: ${_param:nginx_proxy_openstack_glance_host}
port: 9292
protocol: http
size: 30000m
host:
name: ${_param:nginx_proxy_openstack_api_host}
port: 9292
+ address: ${_param:nginx_proxy_openstack_api_address}
ssl: ${_param:nginx_proxy_ssl}
nginx_proxy_openstack_api_neutron:
enabled: true
@@ -78,36 +90,39 @@
name: openstack_api_neutron
check: false
proxy:
- host: ${_param:neutron_service_host}
+ host: ${_param:nginx_proxy_openstack_neutron_host}
port: 9696
protocol: http
host:
name: ${_param:nginx_proxy_openstack_api_host}
port: 9696
+ address: ${_param:nginx_proxy_openstack_api_address}
ssl: ${_param:nginx_proxy_ssl}
nginx_proxy_openstack_api_heat_cloudwatch:
enabled: true
type: nginx_proxy
name: openstack_api_heat_cloudwatch
proxy:
- host: ${_param:heat_service_host}
+ host: ${_param:nginx_proxy_openstack_heat_host}
port: 8003
protocol: http
host:
name: ${_param:nginx_proxy_openstack_api_host}
port: 8003
+ address: ${_param:nginx_proxy_openstack_api_address}
ssl: ${_param:nginx_proxy_ssl}
nginx_proxy_openstack_api_heat_cfn:
enabled: true
type: nginx_proxy
name: openstack_api_heat_cfn
proxy:
- host: ${_param:heat_service_host}
+ host: ${_param:nginx_proxy_openstack_heat_host}
port: 8000
protocol: http
host:
name: ${_param:nginx_proxy_openstack_api_host}
port: 8000
+ address: ${_param:nginx_proxy_openstack_api_address}
ssl: ${_param:nginx_proxy_ssl}
nginx_proxy_openstack_api_heat:
enabled: true
@@ -115,12 +130,13 @@
name: openstack_api_heat
check: false
proxy:
- host: ${_param:heat_service_host}
+ host: ${_param:nginx_proxy_openstack_heat_host}
port: 8004
protocol: http
host:
name: ${_param:nginx_proxy_openstack_api_host}
port: 8004
+ address: ${_param:nginx_proxy_openstack_api_address}
ssl: ${_param:nginx_proxy_ssl}
nginx_proxy_openstack_api_nova_ec2:
enabled: true
@@ -128,10 +144,11 @@
name: openstack_api_nova_ec2
check: false
proxy:
- host: ${_param:nova_service_host}
+ host: ${_param:nginx_proxy_openstack_nova_host}
port: 8773
protocol: http
host:
name: ${_param:nginx_proxy_openstack_api_host}
port: 8773
+ address: ${_param:nginx_proxy_openstack_api_address}
ssl: ${_param:nginx_proxy_ssl}
diff --git a/opencontrail/control/control.yml b/opencontrail/control/control.yml
index 50c0c77..e846f5d 100644
--- a/opencontrail/control/control.yml
+++ b/opencontrail/control/control.yml
@@ -4,7 +4,7 @@
- system.haproxy.proxy.listen.opencontrail.control
parameters:
_param:
- multi_tenancy: false
+ multi_tenancy: true
opencontrail_message_queue_node01_address: ${_param:openstack_message_queue_node01_address}
opencontrail_message_queue_node02_address: ${_param:openstack_message_queue_node02_address}
opencontrail_message_queue_node03_address: ${_param:openstack_message_queue_node03_address}
diff --git a/salt/master/formula/git/monitoring.yml b/salt/master/formula/git/monitoring.yml
index e0cf30d..ab8a8fc 100644
--- a/salt/master/formula/git/monitoring.yml
+++ b/salt/master/formula/git/monitoring.yml
@@ -4,6 +4,10 @@
environment:
dev:
formula:
+ fluentd:
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-fluentd.git'
+ revision: ${_param:salt_master_environment_revision}
prometheus:
source: git
address: '${_param:salt_master_environment_repository}/salt-formula-prometheus.git'
diff --git a/salt/master/formula/pkg/monitoring.yml b/salt/master/formula/pkg/monitoring.yml
index 375cbd8..9e2db0b 100644
--- a/salt/master/formula/pkg/monitoring.yml
+++ b/salt/master/formula/pkg/monitoring.yml
@@ -4,6 +4,9 @@
environment:
prd:
formula:
+ fluentd:
+ source: pkg
+ name: salt-formula-fluentd
prometheus:
source: pkg
name: salt-formula-prometheus