aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kud/deployment_infra/playbooks/configure-emco.yml2
-rw-r--r--kud/deployment_infra/playbooks/kud-vars.yml10
-rwxr-xr-xkud/tests/emco.sh1
3 files changed, 10 insertions, 3 deletions
diff --git a/kud/deployment_infra/playbooks/configure-emco.yml b/kud/deployment_infra/playbooks/configure-emco.yml
index 82ce61ad..b3266b70 100644
--- a/kud/deployment_infra/playbooks/configure-emco.yml
+++ b/kud/deployment_infra/playbooks/configure-emco.yml
@@ -62,7 +62,7 @@
when: "'emco' in emco_roles"
- name: Install emco helm charts
- command: /usr/local/bin/helm install --wait --namespace emco -f helm_value_overrides.yaml --set emco-db.etcd.clusterDomain={{ cluster_name.stdout }} --set emco-tools.fluentd.clusterDomain={{ cluster_name.stdout }} emco dist/packages/emco-0.1.0.tgz
+ command: /usr/local/bin/helm install --wait --timeout 10m --namespace emco -f helm_value_overrides.yaml --set emco-db.etcd.clusterDomain={{ cluster_name.stdout }} --set emco-tools.fluentd.clusterDomain={{ cluster_name.stdout }} emco dist/packages/emco-0.1.0.tgz
args:
chdir: "{{ emco_dir }}/deployments/helm/emcoOpenNESS"
when: "'emco' in emco_roles"
diff --git a/kud/deployment_infra/playbooks/kud-vars.yml b/kud/deployment_infra/playbooks/kud-vars.yml
index 35057f5b..d627ab22 100644
--- a/kud/deployment_infra/playbooks/kud-vars.yml
+++ b/kud/deployment_infra/playbooks/kud-vars.yml
@@ -80,7 +80,7 @@ optane_ipmctl_package: ipmctl_02.00.00.3474+really01.00.00.3469.orig
emco_git_url: "https://github.com/open-ness/EMCO.git"
emco_repository: "integratedcloudnative/"
-emco_version: "openness-21.03"
+emco_version: "openness-21.03.06"
emco_dir: "/opt/emco"
emco_values:
global:
@@ -101,8 +101,16 @@ emco_values:
imageTag: "{{ emco_version }}"
dtc:
imageTag: "{{ emco_version }}"
+ nps:
+ imageTag: "{{ emco_version }}"
+ sds:
+ imageTag: "{{ emco_version }}"
gac:
imageTag: "{{ emco_version }}"
+ sfc:
+ imageTag: "{{ emco_version }}"
+ sfcclient:
+ imageTag: "{{ emco_version }}"
emcoconfig_localhost: true
emcoctl_localhost: true
emco_roles:
diff --git a/kud/tests/emco.sh b/kud/tests/emco.sh
index 7cc3ca33..1e003968 100755
--- a/kud/tests/emco.sh
+++ b/kud/tests/emco.sh
@@ -521,7 +521,6 @@ function instantiate {
}
function terminateOrchData {
- call_api -d "{ }" "${base_url_dcm}/projects/${projectname}/logical-clouds/${admin_logical_cloud_name}/terminate"
call_api -d "{ }" "${base_url_orchestrator}/projects/${projectname}/composite-apps/${collection_compositeapp_name}/${compositeapp_version}/deployment-intent-groups/${deployment_intent_group_name}/terminate"
call_api -d "{ }" "${base_url_dcm}/projects/${projectname}/logical-clouds/${admin_logical_cloud_name}/terminate"
}