Docker issue

Signed-off-by: arvind.patel@huawei.com <arvind.patel@huawei.com>
Change-Id: Ia6752ed0e3665bb3c12bc17c4ffd37f175aff472

diff --git a/blueprints/iotgateway/playbooks/config.yml b/blueprints/iotgateway/playbooks/config.yml
index da7eaf2..ed5ee5b 100644 (file)
--- a/blueprints/iotgateway/playbooks/config.yml
+++ b/blueprints/iotgateway/playbooks/config.yml
@@ -72,6 +72,8 @@ mecm_port:
   name: 30093
 docker_registry_port:
   name: 5000
+prometheus_node_port:
+  name: 30009
 
 # All Master related password which needs to be specified if user
 # doesn't need common password for security purpose

diff --git a/blueprints/iotgateway/playbooks/eliot-all-uninstall.yml b/blueprints/iotgateway/playbooks/eliot-all-uninstall.yml
index 4b5f671..7fb6742 100644 (file)
--- a/blueprints/iotgateway/playbooks/eliot-all-uninstall.yml
+++ b/blueprints/iotgateway/playbooks/eliot-all-uninstall.yml
@@ -29,6 +29,7 @@
     - eg_certs
     - helm
     - k8s
+    - docker
 
 ############ Master ############
 

diff --git a/blueprints/iotgateway/playbooks/eliot-all.yml b/blueprints/iotgateway/playbooks/eliot-all.yml
index 430ff9d..0721b5c 100644 (file)
--- a/blueprints/iotgateway/playbooks/eliot-all.yml
+++ b/blueprints/iotgateway/playbooks/eliot-all.yml
@@ -27,6 +27,7 @@
   roles:
     - k8s
     - helm
+    - docker
     - eg_certs
     - eg_registry
     - eg_helm-repo

diff --git a/blueprints/iotgateway/playbooks/roles/prometheus/tasks/install.yml b/blueprints/iotgateway/playbooks/roles/prometheus/tasks/install.yml
index f8472b4..bdb4c66 100644 (file)
--- a/blueprints/iotgateway/playbooks/roles/prometheus/tasks/install.yml
+++ b/blueprints/iotgateway/playbooks/roles/prometheus/tasks/install.yml
@@ -42,7 +42,18 @@
   when: result is failed and ansible_architecture == 'aarch64'
 
 - name: "INSTALL: Install prometheus on aarch64"
-  shell:
-    cmd: 'helm install mep-prometheus
-    stable/prometheus -f /tmp/prometheus/values.yaml --version v9.3.1'
+  # yamllint disable rule:line-length
+  command: helm install mep-prometheus stable/prometheus -f /tmp/prometheus/values.yaml --version v9.3.1 --set alertmanager.image.repository={{ vardata.private_repo_ip.name}}:{{ vardata.docker_registry_port.name}}/prom/alertmanager --set configmapReload.image.repository={{ vardata.private_repo_ip.name}}:{{ vardata.docker_registry_port.name}}/jimmidyson/configmap-reload --set nodeExporter.image.repository={{ vardata.private_repo_ip.name}}:{{ vardata.docker_registry_port.name}}/prom/node-exporter --set server.image.repository={{ vardata.private_repo_ip.name}}:{{ vardata.docker_registry_port.name}}/prom/prometheus --set pushgateway.image.repository={{ vardata.private_repo_ip.name}}:{{ vardata.docker_registry_port.name}}/prom/pushgateway --set kubeStateMetrics.image.repository={{ vardata.private_repo_ip.name}}:{{ vardata.docker_registry_port.name}}/carlosedp/kube-state-metrics --set alertmanager.image.pullPolicy=IfNotPresent --set configmapReload.image.pullPolicy=IfNotPresent --set nodeExporter.image.pullPolicy=IfNotPresent --set server.image.pullPolicy=IfNotPresent --set pushgateway.image.pullPolicy=IfNotPresent --set kubeStateMetrics.image.pullPolicy=IfNotPresent
+  # yamllint disable rule:line-length
   when: result is failed and ansible_architecture == 'aarch64'
+
+- name: Expose promethious server
+  # yamllint disable rule:line-length
+  command: kubectl expose deployment mep-prometheus-server  --type=NodePort --name nodeport-mep-prometheus-server
+  # yamllint disable rule:line-length
+
+- name: Execute patch service with given port
+  shell:
+    # yamllint disable rule:line-length
+    cmd: "kubectl patch service nodeport-mep-prometheus-server  --type='json' --patch='[{ \"op\": \"replace\", \"path\": \"/spec/ports/0/nodePort\", \"value\":{{ vardata.prometheus_node_port.name }}}]'"
+    # yamllint disable rule:line-length