Remove Keepalived service

The Keepalived servier has been remove completely so any definition for the service can be removed now. Related-Bug: #1926314 Depends-on: https://review.opendev.org/788200 Depends-on: https://review.opendev.org/788095 Change-Id: I01b066aefa6b7d6bd0cf69dbe5327db6934d6d6e
openstack-archive · Apr 27, 2021 · 9793ddd · 9793ddd
1 parent fb9edd2
commit 9793ddd
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 98 deletions.
diff --git a/container-images/tcib/base/keepalived/keepalived.yaml b/container-images/tcib/base/keepalived/keepalived.yaml
diff --git a/container-images/tripleo_containers.yaml b/container-images/tripleo_containers.yaml
@@ -83,8 +83,6 @@ container_images:
   image_source: tripleo
 - imagename: quay.io/tripleomaster/openstack-iscsid:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-keepalived:current-tripleo
-  image_source: tripleo
 - imagename: quay.io/tripleomaster/openstack-keystone:current-tripleo
   image_source: tripleo
 - imagename: quay.io/tripleomaster/openstack-manila-api:current-tripleo

diff --git a/container-images/tripleo_containers.yaml.j2 b/container-images/tripleo_containers.yaml.j2
@@ -361,15 +361,6 @@ container_images_template:
   services:
   - OS::TripleO::Services::Iscsid
 
-- imagename: "{{namespace}}/{{name_prefix}}keepalived{{name_suffix}}:{{tag}}"
-  image_source: tripleo
-  params:
-  - ContainerKeepalivedConfigImage
-  - ContainerKeepalivedImage
-  services:
-  - OS::TripleO::Services::Keepalived
-  - OS::TripleO::Services::UndercloudKeepalived
-
 - imagename: "{{namespace}}/{{name_prefix}}keystone{{name_suffix}}:{{tag}}"
   image_source: tripleo
   params:

diff --git a/tripleo_common/tests/inventory_data/cell1_dynamic.json b/tripleo_common/tests/inventory_data/cell1_dynamic.json
@@ -186,14 +186,6 @@
             "ansible_ssh_user": "heat-admin"
         }
     },
-    "keepalived": {
-        "children": [
-            "CellController"
-        ],
-        "vars": {
-            "ansible_ssh_user": "heat-admin"
-        }
-    },
     "kernel": {
         "children": [
             "CellController",

diff --git a/tripleo_common/tests/inventory_data/cell1_static.yaml b/tripleo_common/tests/inventory_data/cell1_static.yaml
@@ -70,10 +70,6 @@ kernel:
     CellController: {}
     Compute: {}
   vars: {ansible_ssh_user: heat-admin}
-keepalived:
-  children:
-    CellController: {}
-  vars: {ansible_ssh_user: heat-admin}
 mysql:
   children:
     CellController: {}

diff --git a/tripleo_common/tests/inventory_data/merged_dynamic.json b/tripleo_common/tests/inventory_data/merged_dynamic.json
@@ -263,14 +263,6 @@
           "ansible_ssh_user": "heat-admin"
         }
     },
-    "cell1_keepalived": {
-        "children": [
-            "cell1_CellController"
-        ],
-        "vars": {
-          "ansible_ssh_user": "heat-admin"
-        }
-    },
     "cell1_kernel": {
         "children": [
             "cell1_CellController",
@@ -529,12 +521,6 @@
             "overcloud_iscsid"
         ]
     },
-    "keepalived": {
-        "children": [
-            "cell1_keepalived",
-            "overcloud_keepalived"
-        ]
-    },
     "kernel": {
         "children": [
             "cell1_kernel",
@@ -845,14 +831,6 @@
           "ansible_ssh_user": "heat-admin"
         }
     },
-    "overcloud_keepalived": {
-        "children": [
-            "overcloud_Controller"
-        ],
-        "vars": {
-          "ansible_ssh_user": "heat-admin"
-        }
-    },
     "overcloud_kernel": {
         "children": [
             "overcloud_Compute",

diff --git a/tripleo_common/tests/inventory_data/merged_static.yaml b/tripleo_common/tests/inventory_data/merged_static.yaml
@@ -93,15 +93,6 @@ cell1_kernel:
     cell1_Compute: {}
   vars:
     ansible_ssh_user: heat-admin
-keepalived:
-  children:
-    cell1_keepalived: {}
-    overcloud_keepalived: {}
-cell1_keepalived:
-  children:
-    cell1_CellController: {}
-  vars:
-    ansible_ssh_user: heat-admin
 mysql:
   children:
     cell1_mysql: {}
@@ -519,11 +510,6 @@ overcloud_keystone_admin_api:
     overcloud_Controller: {}
   vars:
     ansible_ssh_user: heat-admin
-overcloud_keepalived:
-  children:
-    overcloud_Controller: {}
-  vars:
-    ansible_ssh_user: heat-admin
 overcloud_certmonger_user:
   children:
     overcloud_Compute: {}

diff --git a/tripleo_common/tests/inventory_data/overcloud_dynamic.json b/tripleo_common/tests/inventory_data/overcloud_dynamic.json
@@ -254,14 +254,6 @@
             "ansible_ssh_user": "heat-admin"
         }
     },
-    "keepalived": {
-        "children": [
-            "Controller"
-        ],
-        "vars": {
-            "ansible_ssh_user": "heat-admin"
-        }
-    },
     "kernel": {
         "children": [
             "Compute",

diff --git a/tripleo_common/tests/inventory_data/overcloud_static.yaml b/tripleo_common/tests/inventory_data/overcloud_static.yaml
@@ -131,10 +131,6 @@ keystone_admin_api:
   children:
     Controller: {}
   vars: {ansible_ssh_user: heat-admin}
-keepalived:
-  children:
-    Controller: {}
-  vars: {ansible_ssh_user: heat-admin}
 certmonger_user:
   children:
     Compute: {}

diff --git a/tripleo_common/tests/inventory_data/single_dynamic.json b/tripleo_common/tests/inventory_data/single_dynamic.json
@@ -357,19 +357,6 @@
           "ansible_ssh_user": "heat-admin"
         }
     },
-    "keepalived": {
-        "children": [
-            "overcloud_keepalived"
-        ]
-    },
-    "overcloud_keepalived": {
-        "children": [
-            "overcloud_Controller"
-        ],
-        "vars": {
-          "ansible_ssh_user": "heat-admin"
-        }
-    },
     "kernel": {
         "children": [
             "overcloud_kernel"

diff --git a/tripleo_common/tests/inventory_data/single_static.yaml b/tripleo_common/tests/inventory_data/single_static.yaml
@@ -250,14 +250,6 @@ overcloud_keystone_admin_api:
   - overcloud_Controller
   vars:
     ansible_ssh_user: heat-admin
-keepalived:
-  children:
-  - overcloud_keepalived
-overcloud_keepalived:
-  children:
-  - overcloud_Controller
-  vars:
-    ansible_ssh_user: heat-admin
 certmonger_user:
   children:
   - overcloud_certmonger_user