Revert "Proposing Lean OpenWhisk (#3886)"

ansible/README.md

@@ -280,17 +280,6 @@ This is usually not necessary, however in case you want to uninstall all prereqs
 ansible-playbook -i environments/<environment> prereq.yml -e mode=clean
 ```
 
-### Lean Setup
-To have a lean setup (no Kafka, Zookeeper and no Invokers as separate entities):
-
-At [Deploying Using CouchDB](ansible/README.md#deploying-using-cloudant) step, replace:
-```
-ansible-playbook -i environments/<environment> openwhisk.yml
-```
-by:
-```
-ansible-playbook -i environments/<environment> openwhisk-lean.yml
-```
 
 ### Troubleshooting
 Some of the more common problems and their solution are listed here.

ansible/roles/controller/tasks/deploy.yml

@@ -6,15 +6,14 @@
 
 - import_tasks: docker_login.yml
 
-- name: get controller name, index and image name
+- name: get controller name and index
   set_fact:
     controller_name: "{{ name_prefix ~ host_group.index(inventory_hostname) }}"
     controller_index:
       "{{ (controller_index_base|int) + host_group.index(inventory_hostname) }}"
-    image_name: "{{ image_name | default('controller') }}"
 
-- name: pull the {{ image_name }}:{{ docker.image.tag }} image of controller
-  shell: "docker pull {{docker_registry}}{{ docker.image.prefix }}/{{image_name}}:{{docker.image.tag}}"
+- name: "pull the {{ docker.image.tag }} image of controller"
+  shell: "docker pull {{docker_registry}}{{ docker.image.prefix }}/controller:{{docker.image.tag}}"
   when: docker_registry != ""
   register: result
   until: (result.rc == 0)
@@ -277,32 +276,26 @@
     controller_volumes: "{{ controller_volumes|default({}) + [coverage_logs_dir+'/controller:/coverage']  }}"
   when: coverage_enabled
 
-- name: populate controller docker container parameters
-  set_fact:
-    controller_container_params:
-      name: "{{ controller_name }}"
-      image: "{{docker_registry~docker.image.prefix}}/{{ image_name }}:{{ 'cov' if (coverage_enabled) else docker.image.tag }}"
-      state: started
-      recreate: true
-      restart_policy: "{{ docker.restart.policy }}"
-      hostname: "{{ controller_name }}"
-      command:
-        /bin/sh -c
-        "exec /init.sh {{ controller_index }}
-        >> /logs/{{ controller_name }}_logs.log 2>&1"
-
 - name: include plugins
   include_tasks: "{{ item }}.yml"
   with_items: "{{ controller_plugins | default([]) }}"
 
 - name: (re)start controller
-  vars:
-    params:
-      env: "{{ env }}"
-      volumes: "{{ controller_volumes }}"
-      ports: "{{ ports_to_expose }}"
-
-  docker_container: "{{ controller_container_params | combine(params) }}"
+  docker_container:
+    name: "{{ controller_name }}"
+    image:
+      "{{docker_registry~docker.image.prefix}}/controller:{{ 'cov' if (coverage_enabled) else docker.image.tag }}"
+    state: started
+    recreate: true
+    restart_policy: "{{ docker.restart.policy }}"
+    hostname: "{{ controller_name }}"
+    env: "{{ env }}"
+    volumes: "{{ controller_volumes }}"
+    ports: "{{ ports_to_expose }}"
+    command:
+      /bin/sh -c
+      "exec /init.sh {{ controller_index }}
+      >> /logs/{{ controller_name }}_logs.log 2>&1"
 
 - name: wait until the Controller in this host is up and running
   uri:

ansible/roles/invoker/tasks/deploy.yml

@@ -309,7 +309,6 @@
     volumes: "{{ volumes }}"
     ports: "{{ ports_to_expose }}"
     command: /bin/sh -c "exec /init.sh --id {{ invoker_index }} --uniqueName {{ invoker_index }} >> /logs/{{ invoker_name }}_logs.log 2>&1"
-  when: lean is undefined
 
 - name: wait until Invoker is up and running
   uri:
@@ -321,4 +320,3 @@
   until: result.status == 200
   retries: 12
   delay: 5
-  when: lean is undefined

ansible/setup.yml

@@ -92,7 +92,3 @@
   - name: generate invoker certificates
     when: invoker.protocol == 'https'
     local_action: shell "{{ playbook_dir }}/files/genssl.sh" "{{ invoker.ssl.cn }}" "server" "{{ playbook_dir }}/roles/invoker/files" {{ invoker.ssl.keystore.password }} {{ invoker.ssl.keyPrefix }} "generateKey"
-
-  - name: generate lean controller plugin invoker certificates
-    when: invoker.protocol == 'https'
-    local_action: shell "{{ playbook_dir }}/files/genssl.sh" "{{ invoker.ssl.cn }}" "server" "{{ playbook_dir }}/files" {{ invoker.ssl.keystore.password }} {{ invoker.ssl.keyPrefix }} "generateKey"

core/controller/build.gradle

@@ -43,7 +43,6 @@ dependencies {
     compile 'com.lightbend.akka.discovery:akka-discovery-kubernetes-api_2.12:0.11.0'
     compile 'com.lightbend.akka.discovery:akka-discovery-marathon-api_2.12:0.11.0'
     compile project(':common:scala')
-    compile project(':core:invoker')
     scoverage gradle.scoverage.deps
 }