Revert "octavia: Add support for disabling amphora provider"

cityofships · cityofships · commit e70b1a12e0f2 · 2021-06-24T16:29:06.000+02:00
This reverts commit 9e14aa0.
diff --git a/ansible/roles/octavia/tasks/config.yml b/ansible/roles/octavia/tasks/config.yml
@@ -82,67 +82,69 @@
   notify:
     - "Restart {{ item.key }} container"
 
-- block:
-
-    - name: Copying over Octavia SSH key
-      copy:
-        content: "{{ octavia_amp_ssh_key.private_key }}"
-        dest: "{{ node_config_directory }}/octavia-worker/{{ octavia_amp_ssh_key_name }}"
-        owner: "{{ config_owner_user }}"
-        group: "{{ config_owner_group }}"
-        mode: "0400"
-      become: True
-      when: inventory_hostname in groups[octavia_services['octavia-worker']['group']]
-
-    - name: Copying certificate files for octavia-worker
-      vars:
-        service: "{{ octavia_services['octavia-worker'] }}"
-      copy:
-        src: "{{ node_custom_config }}/octavia/{{ item }}"
-        dest: "{{ node_config_directory }}/octavia-worker/{{ item }}"
-        mode: "0660"
-      become: true
-      when:
-        - inventory_hostname in groups[service.group]
-        - service.enabled | bool
-      with_items: "{{ octavia_amphora_keys }}"
-      notify:
-        - Restart octavia-worker container
+- name: Copying over Octavia SSH key
+  copy:
+    content: "{{ octavia_amp_ssh_key.private_key }}"
+    dest: "{{ node_config_directory }}/octavia-worker/{{ octavia_amp_ssh_key_name }}"
+    owner: "{{ config_owner_user }}"
+    group: "{{ config_owner_group }}"
+    mode: "0400"
+  become: True
+  when: inventory_hostname in groups[octavia_services['octavia-worker']['group']]
 
-    - name: Copying certificate files for octavia-housekeeping
-      vars:
-        service: "{{ octavia_services['octavia-housekeeping'] }}"
-      copy:
-        src: "{{ node_custom_config }}/octavia/{{ item }}"
-        dest: "{{ node_config_directory }}/octavia-housekeeping/{{ item }}"
-        mode: "0660"
-      become: true
-      when:
-        - inventory_hostname in groups[service.group]
-        - service.enabled | bool
-      with_items: "{{ octavia_amphora_keys }}"
-      notify:
-        - Restart octavia-housekeeping container
+- name: Copying certificate files for octavia-worker
+  vars:
+    service: "{{ octavia_services['octavia-worker'] }}"
+  copy:
+    src: "{{ node_custom_config }}/octavia/{{ item }}"
+    dest: "{{ node_config_directory }}/octavia-worker/{{ item }}"
+    mode: "0660"
+  become: true
+  when:
+    - inventory_hostname in groups[service.group]
+    - service.enabled | bool
+  with_items:
+    - client.cert-and-key.pem
+    - client_ca.cert.pem
+    - server_ca.cert.pem
+    - server_ca.key.pem
+  notify:
+    - Restart octavia-worker container
 
-    - name: Copying certificate files for octavia-health-manager
-      vars:
-        service: "{{ octavia_services['octavia-health-manager'] }}"
-      copy:
-        src: "{{ node_custom_config }}/octavia/{{ item }}"
-        dest: "{{ node_config_directory }}/octavia-health-manager/{{ item }}"
-        mode: "0660"
-      become: true
-      when:
-        - inventory_hostname in groups[service.group]
-        - service.enabled | bool
-      with_items: "{{ octavia_amphora_keys }}"
-      notify:
-        - Restart octavia-health-manager container
+- name: Copying certificate files for octavia-housekeeping
+  vars:
+    service: "{{ octavia_services['octavia-housekeeping'] }}"
+  copy:
+    src: "{{ node_custom_config }}/octavia/{{ item }}"
+    dest: "{{ node_config_directory }}/octavia-housekeeping/{{ item }}"
+    mode: "0660"
+  become: true
+  when:
+    - inventory_hostname in groups[service.group]
+    - service.enabled | bool
+  with_items:
+    - client.cert-and-key.pem
+    - client_ca.cert.pem
+    - server_ca.cert.pem
+    - server_ca.key.pem
+  notify:
+    - Restart octavia-housekeeping container
 
-  when: "'amphora' in octavia_provider_drivers"
+- name: Copying certificate files for octavia-health-manager
   vars:
-    octavia_amphora_keys:
-      - client.cert-and-key.pem
-      - client_ca.cert.pem
-      - server_ca.cert.pem
-      - server_ca.key.pem
+    service: "{{ octavia_services['octavia-health-manager'] }}"
+  copy:
+    src: "{{ node_custom_config }}/octavia/{{ item }}"
+    dest: "{{ node_config_directory }}/octavia-health-manager/{{ item }}"
+    mode: "0660"
+  become: true
+  when:
+    - inventory_hostname in groups[service.group]
+    - service.enabled | bool
+  with_items:
+    - client.cert-and-key.pem
+    - client_ca.cert.pem
+    - server_ca.cert.pem
+    - server_ca.key.pem
+  notify:
+    - Restart octavia-health-manager container
diff --git a/ansible/roles/octavia/tasks/precheck.yml b/ansible/roles/octavia/tasks/precheck.yml
@@ -41,7 +41,6 @@
       Octavia's certificate configuration has been changed since Train. The new
       configuration requires 4 PEM files. Please check certificate configuration
       guide at https://docs.openstack.org/octavia/latest/admin/guides/certificates.html
-  when: "'amphora' in octavia_provider_drivers"
 
 - name: Checking certificate files exist for octavia
   stat:
@@ -50,9 +49,7 @@
   run_once: True
   register: result
   failed_when: not result.stat.exists
-  when:
-    - inventory_hostname in groups['octavia-worker']
-    - "'amphora' in octavia_provider_drivers"
+  when: inventory_hostname in groups['octavia-worker']
   with_items:
     - client.cert-and-key.pem
     - client_ca.cert.pem
diff --git a/ansible/roles/octavia/templates/octavia-health-manager.json.j2 b/ansible/roles/octavia/templates/octavia-health-manager.json.j2
@@ -6,7 +6,7 @@
             "dest": "/etc/octavia/octavia.conf",
             "owner": "octavia",
             "perm": "0600"
-        }{% if 'amphora' in octavia_provider_drivers %},
+        },
         {
             "source": "{{ container_config_directory }}/client.cert-and-key.pem",
             "dest": "/etc/octavia/certs/client.cert-and-key.pem",
@@ -30,6 +30,6 @@
             "dest": "/etc/octavia/certs/server_ca.key.pem",
             "owner": "octavia",
             "perm": "0600"
-        }{% endif %}
+        }
     ]
 }
diff --git a/ansible/roles/octavia/templates/octavia-housekeeping.json.j2 b/ansible/roles/octavia/templates/octavia-housekeeping.json.j2
@@ -6,7 +6,7 @@
             "dest": "/etc/octavia/octavia.conf",
             "owner": "octavia",
             "perm": "0600"
-        }{% if 'amphora' in octavia_provider_drivers %},
+        },
         {
             "source": "{{ container_config_directory }}/client.cert-and-key.pem",
             "dest": "/etc/octavia/certs/client.cert-and-key.pem",
@@ -30,6 +30,6 @@
             "dest": "/etc/octavia/certs/server_ca.key.pem",
             "owner": "octavia",
             "perm": "0600"
-        }{% endif %}
+        }
     ]
 }
diff --git a/ansible/roles/octavia/templates/octavia-worker.json.j2 b/ansible/roles/octavia/templates/octavia-worker.json.j2
@@ -6,7 +6,7 @@
             "dest": "/etc/octavia/octavia.conf",
             "owner": "octavia",
             "perm": "0600"
-        }{% if 'amphora' in octavia_provider_drivers %},
+        },
         {
             "source": "{{ container_config_directory }}/client.cert-and-key.pem",
             "dest": "/etc/octavia/certs/client.cert-and-key.pem",
@@ -30,6 +30,6 @@
             "dest": "/etc/octavia/certs/server_ca.key.pem",
             "owner": "octavia",
             "perm": "0600"
-        }{% endif %}
+        }
     ]
 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`"dest": "/etc/octavia/octavia.conf",`
`7`	`7`	`"owner": "octavia",`
`8`	`8`	`"perm": "0600"`
`9`		`- }{% if 'amphora' in octavia_provider_drivers %},`
	`9`	`+ },`
`10`	`10`	`{`
`11`	`11`	`"source": "{{ container_config_directory }}/client.cert-and-key.pem",`
`12`	`12`	`"dest": "/etc/octavia/certs/client.cert-and-key.pem",`
`@@ -30,6 +30,6 @@`
`30`	`30`	`"dest": "/etc/octavia/certs/server_ca.key.pem",`
`31`	`31`	`"owner": "octavia",`
`32`	`32`	`"perm": "0600"`
`33`		`- }{% endif %}`
	`33`	`+ }`
`34`	`34`	`]`
`35`	`35`	`}`