Browse Source

Merge "Remove Keepalived service"

changes/73/788873/1
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
c3f92930ea
11 changed files with 0 additions and 98 deletions
  1. +0
    -6
      container-images/tcib/base/keepalived/keepalived.yaml
  2. +0
    -2
      container-images/tripleo_containers.yaml
  3. +0
    -9
      container-images/tripleo_containers.yaml.j2
  4. +0
    -8
      tripleo_common/tests/inventory_data/cell1_dynamic.json
  5. +0
    -4
      tripleo_common/tests/inventory_data/cell1_static.yaml
  6. +0
    -22
      tripleo_common/tests/inventory_data/merged_dynamic.json
  7. +0
    -14
      tripleo_common/tests/inventory_data/merged_static.yaml
  8. +0
    -8
      tripleo_common/tests/inventory_data/overcloud_dynamic.json
  9. +0
    -4
      tripleo_common/tests/inventory_data/overcloud_static.yaml
  10. +0
    -13
      tripleo_common/tests/inventory_data/single_dynamic.json
  11. +0
    -8
      tripleo_common/tests/inventory_data/single_static.yaml

+ 0
- 6
container-images/tcib/base/keepalived/keepalived.yaml View File

@ -1,6 +0,0 @@
tcib_actions:
- run: dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
tcib_packages:
common:
- hostname
- keepalived

+ 0
- 2
container-images/tripleo_containers.yaml View File

@ -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


+ 0
- 9
container-images/tripleo_containers.yaml.j2 View File

@ -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:


+ 0
- 8
tripleo_common/tests/inventory_data/cell1_dynamic.json View File

@ -186,14 +186,6 @@
"ansible_ssh_user": "heat-admin"
}
},
"keepalived": {
"children": [
"CellController"
],
"vars": {
"ansible_ssh_user": "heat-admin"
}
},
"kernel": {
"children": [
"CellController",


+ 0
- 4
tripleo_common/tests/inventory_data/cell1_static.yaml View File

@ -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: {}


+ 0
- 22
tripleo_common/tests/inventory_data/merged_dynamic.json View File

@ -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",


+ 0
- 14
tripleo_common/tests/inventory_data/merged_static.yaml View File

@ -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: {}


+ 0
- 8
tripleo_common/tests/inventory_data/overcloud_dynamic.json View File

@ -254,14 +254,6 @@
"ansible_ssh_user": "heat-admin"
}
},
"keepalived": {
"children": [
"Controller"
],
"vars": {
"ansible_ssh_user": "heat-admin"
}
},
"kernel": {
"children": [
"Compute",


+ 0
- 4
tripleo_common/tests/inventory_data/overcloud_static.yaml View File

@ -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: {}


+ 0
- 13
tripleo_common/tests/inventory_data/single_dynamic.json View File

@ -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"


+ 0
- 8
tripleo_common/tests/inventory_data/single_static.yaml View File

@ -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


Loading…
Cancel
Save