Merge "Replace emco with openness-21.03 release"

6 files changed, 244 insertions, 45 deletions

diff --git a/kud/deployment_infra/playbooks/configure-emco-reset.yml b/kud/deployment_infra/playbooks/configure-emco-reset.yml
index 7cad36e4..d13bb9e7 100644
--- a/kud/deployment_infra/playbooks/configure-emco-reset.yml
+++ b/kud/deployment_infra/playbooks/configure-emco-reset.yml
@@ -8,40 +8,44 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-- hosts: kube-master
+- hosts: localhost
+  become: yes
   tasks:
     - name: Load kud variables
       include_vars:
         file: kud-vars.yml
 
-    - name: Change the emco directory and run helm delete
-      command: /usr/local/bin/helm uninstall --namespace emco emco
-      register: helm_delete
-      args:
-        chdir: /opt/multicloud/deployments/helm/v2/emco
+    - name: Check if emco is installed
+      command: /usr/local/bin/helm -n emco list
+      register: helm_list
 
-    - debug:
-        var: helm_delete.stdout_lines
+    - name: Set helm_installed fact
+      set_fact:
+        helm_installed: "{{ helm_list.stdout | regex_findall('^\\S+', multiline=True) }}"
 
-    - name: Change the emco directory and delete the emco namespace
-      command: /usr/local/bin/kubectl delete ns emco
-      register: delete_emco_ns
-      args:
-        chdir: /opt/multicloud/deployments/helm/v2/emco
+    - name: Uninstall monitor helm chart
+      command: /usr/local/bin/helm uninstall --namespace emco monitor
+      when: '"monitor" in helm_installed'
 
-    - debug:
-        var: delete_emco_ns.stdout_lines
+    - name: Uninstall emco helm charts
+      command: /usr/local/bin/helm uninstall --namespace emco emco
+      when: '"emco" in helm_installed'
 
-    - name: Change the emco directory and make clean
+    - name: Change to the emco directory and delete the emco namespace
+      command: /usr/local/bin/kubectl delete ns emco --ignore-not-found=true
+
+    - name: Check if emco directory exists
+      stat:
+        path: "{{ emco_dir }}"
+      register: emco_dir_stat
+
+    - name: Change to the emco directory and make clean
       command: /usr/bin/make clean
-      register: make_clean
       args:
-        chdir: /opt/multicloud/deployments/helm/v2/emco
-
-    - debug:
-        var: make_clean.stdout_lines
+        chdir: "{{ emco_dir }}/deployments/helm/emcoOpenNESS"
+      when: emco_dir_stat.stat.exists
 
-    - name: clean multicloud-k8s path
+    - name: Clean emco directory
       file:
         state: absent
-        path: /opt/multicloud
+        path: "{{ emco_dir }}"
diff --git a/kud/deployment_infra/playbooks/configure-emco.yml b/kud/deployment_infra/playbooks/configure-emco.yml
index 96b4a23d..82ce61ad 100644
--- a/kud/deployment_infra/playbooks/configure-emco.yml
+++ b/kud/deployment_infra/playbooks/configure-emco.yml
@@ -8,7 +8,8 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-- hosts: kube-master
+- hosts: localhost
+  become: yes
   tasks:
     - name: Load kud variables
       include_vars:
@@ -16,43 +17,159 @@
 
     - name: Getting emco code in /opt folder
       git:
-        repo: 'https://github.com/onap/multicloud-k8s.git'
-        dest: /opt/multicloud
+        repo: "{{ emco_git_url }}"
+        version: "{{ emco_version }}"
+        dest: "{{ emco_dir }}"
+        depth: 1
+        force: yes
 
-    - name: install make package for ubuntu systems
+    - name: Install make package for Ubuntu systems
       apt: name=make state=present update_cache=yes
       when: ansible_distribution == "Ubuntu"
 
-    - name: install make package for centos systems
+    - name: Install make package for CentOS systems
       yum: name=make state=present update_cache=yes
       when: ansible_distribution == "CentOS"
 
-    - name: Change the emco directory and run the command make all
-      command: /usr/bin/make all
-      register: make_all
-      args:
-        chdir: /opt/multicloud/deployments/helm/v2/emco
-
-    - debug:
-        var: make_all.stdout_lines
-
     - name: Create emco namespace
       shell: "/usr/local/bin/kubectl create namespace emco"
       ignore_errors: True
 
     - name: Create pod security policy role bindings
-      shell: "/usr/local/bin/kubectl -n emco create rolebinding psp:default:privileged --clusterrole=psp:privileged --serviceaccount=emco:default --serviceaccount=emco:emco-fluentd"
+      shell: "/usr/local/bin/kubectl -n emco create rolebinding psp:default:privileged --clusterrole=psp:privileged --serviceaccount=emco:default --serviceaccount=emco:emco-fluentd --serviceaccount=emco:monitor"
       ignore_errors: True
 
+    - name: Set artifacts_dir fact
+      set_fact:
+        artifacts_dir: "{{ hostvars[groups['kube-master'][0]]['inventory_dir'] }}/artifacts"
+
+    - name: Make emco helm charts
+      command: /usr/bin/make all
+      args:
+        chdir: "{{ emco_dir }}/deployments/helm/emcoOpenNESS"
+      when: "'emco' in emco_roles"
+
     - name: Get cluster name
-      shell: "kubectl -n kube-system get configmap/kubeadm-config -o yaml | grep clusterName: | awk '{print $2}'"
+      shell: "/usr/local/bin/kubectl -n kube-system get configmap/kubeadm-config -o yaml | grep clusterName: | awk '{print $2}'"
       register: cluster_name
+      when: "'emco' in emco_roles"
+
+    - name: Create helm override values
+      copy:
+        dest: "{{ emco_dir }}/deployments/helm/emcoOpenNESS/helm_value_overrides.yaml"
+        content: |
+          {{ emco_values | to_nice_yaml(indent=2) }}
+      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
+      args:
+        chdir: "{{ emco_dir }}/deployments/helm/emcoOpenNESS"
+      when: "'emco' in emco_roles"
+
+    - name: Apply patch to emcoctl
+      patch:
+        src: emcoctl-openness-21.03.patch
+        basedir: "{{ emco_dir }}"
+        strip: 1
+      when: emco_version == "openness-21.03"
+
+    - name: Make emcoctl
+      command: /usr/bin/make
+      args:
+        chdir: "{{ emco_dir }}/src/tools/emcoctl"
+      when: "'emco' in emco_roles"
 
-    - name: Change the emco directory and run the command helm install
-      command: /usr/local/bin/helm install --namespace emco --set emco-tools.fluentd.clusterDomain={{ cluster_name.stdout }} emco dist/packages/emco-0.1.0.tgz
-      register: helm_install
+    - name: Get emco host address
+      shell: "/usr/local/bin/kubectl -n kube-system get configmap/kubeadm-config -o yaml | awk '/advertiseAddress:/ {print $2;exit}'"
+      register: emco_host
+      when: "'emco' in emco_roles"
+
+    - name: Write emcoctl config on ansible host
+      template:
+        src: emcoconfig.yaml.j2
+        dest: "{{ artifacts_dir }}/emcoconfig.yaml"
+        mode: 0640
+      become: no
+      run_once: yes
+      vars:
+        host: "{{ emco_host.stdout }}"
+      when:
+      - emcoconfig_localhost
+      - "'emco' in emco_roles"
+
+    - name: Copy emcoctl binary to ansible host
+      copy:
+        src: "{{ emco_dir }}/bin/emcoctl/emcoctl"
+        dest: "{{ artifacts_dir }}/emcoctl"
+        mode: 0755
+      become: no
+      run_once: yes
+      when:
+      - emcoctl_localhost
+      - "'emco' in emco_roles"
+
+    - name: Create helper script emcoctl.sh on ansible host
+      copy:
+        content: |
+          #!/bin/bash
+          ${BASH_SOURCE%/*}/emcoctl --config ${BASH_SOURCE%/*}/emcoconfig.yaml "$@"
+        dest: "{{ artifacts_dir }}/emcoctl.sh"
+        mode: 0755
+      become: no
+      run_once: yes
+      when:
+      - emcoctl_localhost
+      - emcoconfig_localhost
+      - "'emco' in emco_roles"
+
+    - name: Apply patch to monitor chart
+      patch:
+        src: emco-monitor-openness-21.03.patch
+        basedir: "{{ emco_dir }}"
+        strip: 1
+      when:
+      - emco_version == "openness-21.03"
+      - "'monitor' in emco_roles"
+
+    - name: Package monitor chart
+      command: /usr/local/bin/helm package monitor
+      args:
+        chdir: "{{ emco_dir }}/deployments/helm"
+      when: "'monitor' in emco_roles"
+
+    - name: Install monitor helm chart
+      command: /usr/local/bin/helm install --wait --namespace emco --set registryPrefix={{ emco_repository }} --set tag={{ emco_version }} monitor monitor-0.1.0.tgz
       args:
-        chdir: /opt/multicloud/deployments/helm/v2/emco
+        chdir: "{{ emco_dir }}/deployments/helm"
+      when: "'monitor' in emco_roles"
+
+- hosts: kube-master
+  become: yes
+  tasks:
+    - name: Load kud variables
+      include_vars:
+        file: kud-vars.yml
+
+    - name: Get emco host address
+      shell: "/usr/local/bin/kubectl -n kube-system get configmap/kubeadm-config -o yaml | grep advertiseAddress: | awk '{print $2}'"
+      register: emco_host
+      when: "'emco' in emco_roles"
+
+    - name: Install emcoctl config
+      template:
+        src: emcoconfig.yaml.j2
+        dest: "~/.emco.yaml"
+        mode: 0640
+      become: no
+      run_once: yes
+      vars:
+        host: "{{ emco_host.stdout }}"
+      when: "'emco' in emco_roles"
 
-    - debug:
-        var: helm_install.stdout_lines
+    - name: Install emcoctl
+      copy:
+        src: "{{ emco_dir }}/bin/emcoctl/emcoctl"
+        dest: "/usr/local/bin/emcoctl"
+        mode: 0755
+      when: "'emco' in emco_roles"
diff --git a/kud/deployment_infra/playbooks/emco-monitor-openness-21.03.patch b/kud/deployment_infra/playbooks/emco-monitor-openness-21.03.patch
new file mode 100644
index 00000000..44c72b6c
--- /dev/null
+++ b/kud/deployment_infra/playbooks/emco-monitor-openness-21.03.patch
@@ -0,0 +1,13 @@
+diff --git a/deployments/helm/monitor/templates/clusterrolebinding.yaml b/deployments/helm/monitor/templates/clusterrolebinding.yaml
+index 70305e50..6616787b 100644
+--- a/deployments/helm/monitor/templates/clusterrolebinding.yaml
++++ b/deployments/helm/monitor/templates/clusterrolebinding.yaml
+@@ -7,7 +7,7 @@ metadata:
+ subjects:
+ - kind: ServiceAccount
+   name: monitor
+-  namespace: default
++  namespace: {{ .Release.Namespace }}
+ roleRef:
+   kind: ClusterRole
+   name: monitor
diff --git a/kud/deployment_infra/playbooks/emcoconfig.yaml.j2 b/kud/deployment_infra/playbooks/emcoconfig.yaml.j2
new file mode 100644
index 00000000..0131cd88
--- /dev/null
+++ b/kud/deployment_infra/playbooks/emcoconfig.yaml.j2
@@ -0,0 +1,21 @@
+orchestrator:
+  host: {{ host }}
+  port: 30415
+clm:
+  host: {{ host }}
+  port: 30461
+ncm:
+  host: {{ host }}
+  port: 30431
+ovnaction:
+  host: {{ host }}
+  port: 30471
+dcm:
+  host: {{ host }}
+  port: 30477
+gac:
+  host: {{ host }}
+  port: 30491
+dtc:
+ host: {{ host }}
+ port: 30481
diff --git a/kud/deployment_infra/playbooks/emcoctl-openness-21.03.patch b/kud/deployment_infra/playbooks/emcoctl-openness-21.03.patch
new file mode 100644
index 00000000..a0b308d3
--- /dev/null
+++ b/kud/deployment_infra/playbooks/emcoctl-openness-21.03.patch
@@ -0,0 +1,13 @@
+diff --git a/src/tools/emcoctl/cmd/utils.go b/src/tools/emcoctl/cmd/utils.go
+index 9f0821e..3d16b92 100644
+--- a/src/tools/emcoctl/cmd/utils.go
++++ b/src/tools/emcoctl/cmd/utils.go
+@@ -106,7 +106,7 @@ func readResources() []Resources {
+ 			return []Resources{}
+ 		}
+ 		valDec := yaml.NewDecoder(v)
+-		var mapDoc map[string]string
++		var mapDoc interface{}
+ 		if valDec.Decode(&mapDoc) != nil {
+ 			fmt.Println("Values file format incorrect:", "error", err, "filename", valuesFiles[0])
+ 			return []Resources{}
diff --git a/kud/deployment_infra/playbooks/kud-vars.yml b/kud/deployment_infra/playbooks/kud-vars.yml
index c430b46f..2735a055 100644
--- a/kud/deployment_infra/playbooks/kud-vars.yml
+++ b/kud/deployment_infra/playbooks/kud-vars.yml
@@ -84,3 +84,34 @@ cpu_manager:
   checkpoint_file: "/var/lib/kubelet/cpu_manager_state"
 topology_manager:
   policy: "best-effort" # Options: none (disabled), best-effort (default), restricted, single-numa-node
+
+emco_git_url: "https://github.com/open-ness/EMCO.git"
+emco_repository: "integratedcloudnative/"
+emco_version: "openness-21.03"
+emco_dir: "/opt/emco"
+emco_values:
+  global:
+    repository: "{{ emco_repository }}"
+    pullPolicy: IfNotPresent
+  emco-services:
+    orchestrator:
+      imageTag: "{{ emco_version }}"
+    ncm:
+      imageTag: "{{ emco_version }}"
+    rsync:
+      imageTag: "{{ emco_version }}"
+    clm:
+      imageTag: "{{ emco_version }}"
+    ovnaction:
+      imageTag: "{{ emco_version }}"
+    dcm:
+      imageTag: "{{ emco_version }}"
+    dtc:
+      imageTag: "{{ emco_version }}"
+    gac:
+      imageTag: "{{ emco_version }}"
+emcoconfig_localhost: true
+emcoctl_localhost: true
+emco_roles:
+- emco
+- monitor