Merge "Add OPENSTACK_ENVIRONMENT property to oscore cookiecutter jobs"
diff --git a/grafana/client/datasource/gnocchi.yml b/grafana/client/datasource/gnocchi.yml
new file mode 100644
index 0000000..4266fe7
--- /dev/null
+++ b/grafana/client/datasource/gnocchi.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ grafana_gnocchi_is_default: false
+ grafana_gnocchi_ds_name: gnocchi
+ grafana_gnocchi_address: ${_param:gnocchi_public_host}
+ keystone_public_url_path: /identity
+ keystone_gnocchi_user: gnocchi
+ grafana_gnocchi_domain: default
+ grafana_gnocchi_project: service
+ grafana:
+ client:
+ datasource:
+ gnocchi:
+ type: gnocchixyz-gnocchi-datasource
+ name: ${_param:grafana_gnocchi_ds_name}
+ host: ${_param:grafana_gnocchi_address}
+ url_path: ${_param:keystone_public_url_path}
+ mode: keystone
+ domain: ${_param:grafana_gnocchi_domain}
+ project: ${_param:grafana_gnocchi_project}
+ user: ${_param:keystone_gnocchi_user}
+ password: ${_param:keystone_gnocchi_password}
+ is_default: ${_param:grafana_gnocchi_is_default}
diff --git a/grafana/client/datasource/influxdb.yml b/grafana/client/datasource/influxdb.yml
index 7abe22f..7e2a459 100644
--- a/grafana/client/datasource/influxdb.yml
+++ b/grafana/client/datasource/influxdb.yml
@@ -14,4 +14,3 @@
password: ${_param:grafana_influxdb_password}
database: ${_param:grafana_influxdb_database}
is_default: ${_param:grafana_influxdb_is_default}
-
diff --git a/kubernetes/common.yml b/kubernetes/common.yml
index bf5886b..82b3ad3 100644
--- a/kubernetes/common.yml
+++ b/kubernetes/common.yml
@@ -15,7 +15,7 @@
kubernetes_externaldns_repo: mirantis
kubernetes_genie_repo: https://docker-prod-local.artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/kubernetes/cni-genie
kubernetes_flannel_repo: quay.io/coreos
- kubernetes_metallb_repo: metallb
+ kubernetes_metallb_repo: ${_param:mcp_docker_registry}/mirantis/metallb
kubernetes_sriov_repo: https://docker-prod-local.artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/kubernetes/sriov-cni
kubernetes_cniplugins_repo: https://docker-prod-local.artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/kubernetes/containernetworking-plugins
kubernetes_dashboard_repo: ${_param:mcp_docker_registry}/mirantis/kubernetes
@@ -44,8 +44,8 @@
kubernetes_genie_source: ${_param:kubernetes_genie_repo}/genie_v1.0-138-gbf5dbaa
kubernetes_genie_source_hash: md5=b024052ed4ecb1d5354e0cc8f51afaca
kubernetes_flannel_image: ${_param:kubernetes_flannel_repo}/flannel:v0.10.0-amd64
- kubernetes_metallb_controller_image: ${_param:kubernetes_metallb_repo}/controller:v0.7.3
- kubernetes_metallb_speaker_image: ${_param:kubernetes_metallb_repo}/speaker:v0.7.3
+ kubernetes_metallb_controller_image: ${_param:kubernetes_metallb_repo}/controller:v0.7.3-2
+ kubernetes_metallb_speaker_image: ${_param:kubernetes_metallb_repo}/speaker:v0.7.3-2
kubernetes_sriov_source: ${_param:kubernetes_sriov_repo}/sriov_v0.3-8-g8b7ed98
kubernetes_sriov_source_hash: md5=c0cc33202afd02e4cc44b977a8faf6e7
kubernetes_cniplugins_source: ${_param:kubernetes_cniplugins_repo}/cni-plugins_v0.7.1-48-g696b1f9.tar.gz
@@ -258,6 +258,8 @@
criproxy_source: ${_param:kubernetes_criproxy_checksum}
metallb:
enabled: ${_param:kubernetes_metallb_enabled}
+ controller_image: ${_param:kubernetes_metallb_controller_image}
+ speaker_image: ${_param:kubernetes_metallb_speaker_image}
pool:
enabled: false
kubelet: