Fix kuryr ansible deployment
Missing config options in kuryr.conf Missing kuryr logging Remove useless bootstrap task, justs create a directory Wrong user permissions in config.json file. Missing volumes Missing container capabilities Depends-On: I4c08a21df263fdefe1fe991cb7ad41cfee65019d Change-Id: Id4577a78ebf3f1cda5ee36d14e2cc017f38e0f07 Closes-bug: #1697480
This commit is contained in:
parent
381c18975c
commit
f2fd735d51
@ -26,4 +26,5 @@
|
|||||||
rewriterule23 programname ^(freezer-api|freezer-api_access|freezer-manage).* openstack_python
|
rewriterule23 programname ^(freezer-api|freezer-api_access|freezer-manage).* openstack_python
|
||||||
rewriterule24 programname ^(octavia-api|octavia-health-manager|octavia-housekeeping|octavia-worker).* openstack_python
|
rewriterule24 programname ^(octavia-api|octavia-health-manager|octavia-housekeeping|octavia-worker).* openstack_python
|
||||||
rewriterule25 programname ^(zun-compute).* openstack_python
|
rewriterule25 programname ^(zun-compute).* openstack_python
|
||||||
|
rewriterule26 programname ^(kuryr-server).* openstack_python
|
||||||
</match>
|
</match>
|
||||||
|
@ -14,11 +14,15 @@ kuryr_services:
|
|||||||
enabled: True
|
enabled: True
|
||||||
image: "{{ kuryr_image_full }}"
|
image: "{{ kuryr_image_full }}"
|
||||||
privileged: True
|
privileged: True
|
||||||
|
cap_add:
|
||||||
|
- NET_ADMIN
|
||||||
volumes:
|
volumes:
|
||||||
- "{{ node_config_directory }}/kuryr/:{{ container_config_directory }}/:ro"
|
- "{{ node_config_directory }}/kuryr/:{{ container_config_directory }}/:ro"
|
||||||
- "/etc/localtime:/etc/localtime:ro"
|
- "/etc/localtime:/etc/localtime:ro"
|
||||||
|
- "/lib/modules:/lib/modules:ro"
|
||||||
- "/run:/run:shared"
|
- "/run:/run:shared"
|
||||||
- "/usr/lib/docker:/usr/lib/docker"
|
- "/usr/lib/docker:/usr/lib/docker"
|
||||||
|
- "kolla_logs:/var/log/kolla/"
|
||||||
|
|
||||||
|
|
||||||
####################
|
####################
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
name: "{{ service.container_name }}"
|
name: "{{ service.container_name }}"
|
||||||
image: "{{ service.image }}"
|
image: "{{ service.image }}"
|
||||||
privileged: "{{ service.privileged | default(False) }}"
|
privileged: "{{ service.privileged | default(False) }}"
|
||||||
|
cap_add: "{{ service.cap_add }}"
|
||||||
volumes: "{{ service.volumes }}"
|
volumes: "{{ service.volumes }}"
|
||||||
when:
|
when:
|
||||||
- action != "config"
|
- action != "config"
|
||||||
|
@ -1,19 +0,0 @@
|
|||||||
---
|
|
||||||
- name: Running Kuryr bootstrap container
|
|
||||||
vars:
|
|
||||||
kuryr: "{{ kuryr_services['kuryr'] }}"
|
|
||||||
kolla_docker:
|
|
||||||
action: "start_container"
|
|
||||||
common_options: "{{ docker_common_options }}"
|
|
||||||
detach: False
|
|
||||||
environment:
|
|
||||||
KOLLA_BOOTSTRAP:
|
|
||||||
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
|
|
||||||
image: "{{ kuryr.image }}"
|
|
||||||
labels:
|
|
||||||
BOOTSTRAP:
|
|
||||||
name: "bootstrap_kuryr"
|
|
||||||
restart_policy: "never"
|
|
||||||
volumes: "{{ kuryr.volumes }}"
|
|
||||||
run_once: True
|
|
||||||
delegate_to: "{{ groups[kuryr.group][0] }}"
|
|
@ -81,6 +81,7 @@
|
|||||||
name: "{{ item.value.container_name }}"
|
name: "{{ item.value.container_name }}"
|
||||||
image: "{{ item.value.image }}"
|
image: "{{ item.value.image }}"
|
||||||
privileged: "{{ item.value.privileged|default(False) }}"
|
privileged: "{{ item.value.privileged|default(False) }}"
|
||||||
|
cap_add: "{{ item.value.cap_add }}"
|
||||||
volumes: "{{ item.value.volumes }}"
|
volumes: "{{ item.value.volumes }}"
|
||||||
register: check_kuryr_containers
|
register: check_kuryr_containers
|
||||||
when:
|
when:
|
||||||
|
@ -3,7 +3,5 @@
|
|||||||
|
|
||||||
- include: config.yml
|
- include: config.yml
|
||||||
|
|
||||||
- include: bootstrap.yml
|
|
||||||
|
|
||||||
- name: Flush handlers
|
- name: Flush handlers
|
||||||
meta: flush_handlers
|
meta: flush_handlers
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
---
|
---
|
||||||
- include: config.yml
|
- include: config.yml
|
||||||
|
|
||||||
- include: bootstrap.yml
|
|
||||||
|
|
||||||
- name: Flush handlers
|
- name: Flush handlers
|
||||||
meta: flush_handlers
|
meta: flush_handlers
|
||||||
|
@ -1,8 +1,13 @@
|
|||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
kuryr_uri = http://{{ api_interface_address }}:{{ kuryr_port }}
|
kuryr_uri = http://{{ api_interface_address }}:{{ kuryr_port }}
|
||||||
debug = {{ kuryr_logging_debug }}
|
debug = {{ kuryr_logging_debug }}
|
||||||
|
log_dir = /var/log/kolla/kuryr
|
||||||
|
|
||||||
|
capability_scope = global
|
||||||
|
bindir = /var/lib/kolla/venv/libexec/kuryr
|
||||||
|
|
||||||
[binding]
|
[binding]
|
||||||
|
driver = kuryr.lib.binding.drivers.veth
|
||||||
|
|
||||||
[neutron]
|
[neutron]
|
||||||
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
|
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
{
|
{
|
||||||
"source": "{{ container_config_directory }}/kuryr.conf",
|
"source": "{{ container_config_directory }}/kuryr.conf",
|
||||||
"dest": "/etc/kuryr/kuryr.conf",
|
"dest": "/etc/kuryr/kuryr.conf",
|
||||||
"owner": "root",
|
"owner": "kuryr",
|
||||||
"perm": "0600"
|
"perm": "0600"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -20,5 +20,12 @@
|
|||||||
"perm": "0600",
|
"perm": "0600",
|
||||||
"optional": true
|
"optional": true
|
||||||
}
|
}
|
||||||
|
],
|
||||||
|
"permissions": [
|
||||||
|
{
|
||||||
|
"path": "/var/log/kolla/kuryr",
|
||||||
|
"owner": "kuryr:kolla",
|
||||||
|
"recurse": true
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user