openstack/kolla-ansible
Code Issues Proposed changes

Merge "Neutron Agents json support"

Browse Source
This commit is contained in:
Jenkins 2015-09-29 10:12:57 +00:00 committed by Gerrit Code Review
commit 2599e221a8
11 changed files with 70 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/neutron/tasks/config.yml
View File

@ -137,6 +137,12 @@
config_dest: "{{ node_config_directory }}/{{ service_name }}/ml2_conf.ini"
when: (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents'])
- name: Copying Neutron Agents JSON configuration file
template:
src: "roles/neutron/templates/neutron-agents.json.j2"
dest: "{{ node_config_directory }}/neutron-agents/config.json"
when: inventory_hostname in groups['neutron-server']
- name: Copying Neutron Server JSON configuration file
template:
src: "roles/neutron/templates/neutron-server.json.j2"

2
ansible/roles/neutron/tasks/start.yml
View File

@ -142,7 +142,7 @@
image: "{{ neutron_agents_image_full }}"
volumes:
- "/run:/run"
- "{{ node_config_directory }}/neutron-agents/:/opt/kolla/neutron-agents/:ro"
- "{{ node_config_directory }}/neutron-agents/:/opt/kolla/config_files/:ro"
- "/var/lib/kolla/dev/log:/dev/log"
env:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"

41
ansible/roles/neutron/templates/neutron-agents.json.j2 Normal file
View File

@ -0,0 +1,41 @@
{
"command": "",
"config_files": [
{
"source": "/opt/kolla/config_files/neutron.conf",
"dest": "/etc/neutron/neutron.conf",
"owner": "neutron",
"perm": "0600"
},
{
"source": "/opt/kolla/config_files/dhcp_agent.ini",
"dest": "/etc/neutron/dhcp_agent.ini",
"owner": "neutron",
"perm": "0600"
},
{
"source": "/opt/kolla/config_files/dnsmasq.conf",
"dest": "/etc/neutron/dnsmasq.conf",
"owner": "neutron",
"perm": "0600"
},
{
"source": "/opt/kolla/config_files/l3_agent.ini",
"dest": "/etc/neutron/l3_agent.ini",
"owner": "neutron",
"perm": "0600"
},
{
"source": "/opt/kolla/config_files/ml2_conf.ini",
"dest": "/etc/neutron/plugins/ml2/ml2_conf.ini",
"owner": "neutron",
"perm": "0600"
},
{
"source": "/opt/kolla/config_files/metadata_agent.ini",
"dest": "/etc/neutron/metadata_agent.ini",
"owner": "neutron",
"perm": "0600"
}
]
}

4
docker/neutron/neutron-agents/Dockerfile.j2
View File

@ -32,6 +32,8 @@ COPY neutron-dhcp-agent/ /opt/kolla/neutron-dhcp-agent
COPY neutron-l3-agent/ /opt/kolla/neutron-l3-agent
COPY neutron-metadata-agent/ /opt/kolla/neutron-metadata-agent
CMD ["/usr/bin/supervisord"]
COPY start.sh /
CMD ["/start.sh"]
{{ include_footer }}

13
docker/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh
View File

@ -1,13 +0,0 @@
#!/bin/bash
SOURCES="/opt/kolla/neutron-agents/neutron.conf /opt/kolla/neutron-agents/dhcp_agent.ini /opt/kolla/neutron-agents/dnsmasq.conf"
TARGET="/etc/neutron/"
OWNER="neutron"
for f in $SOURCES; do
if [[ -f "$f" ]]; then
fname=$(basename $f)
cp $f $TARGET
chown ${OWNER}: $TARGET/$fname
chmod 0644 $TARGET/$fname
fi
done

34
docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh
View File

@ -1,37 +1,11 @@
#!/bin/bash
set -o errexit
# Loading common functions.
source /opt/kolla/config-sudoers.sh
# Will be removed when neutron-agents is a thin container
CMD="/usr/bin/neutron-dhcp-agent"
ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini"
# Loading common functions.
source /opt/kolla/kolla-common.sh
source /opt/kolla/config-sudoers.sh
# Override set_configs() here because it doesn't work for fat containers like
# this one.
set_configs() {
case $KOLLA_CONFIG_STRATEGY in
COPY_ALWAYS)
source /opt/kolla/neutron-dhcp-agent/config-external.sh
;;
COPY_ONCE)
if [[ -f /configured-dhcp ]]; then
echo 'INFO - Neutron-dhcp has already been configured; Refusing to copy new configs'
return
fi
source /opt/kolla/neutron-dhcp-agent/config-external.sh
touch /configured-dhcp
;;
*)
echo '$KOLLA_CONFIG_STRATEGY is not set properly'
exit 1
;;
esac
}
# Execute config strategy
set_configs
exec $CMD $ARGS

23
docker/neutron/neutron-agents/neutron-l3-agent/config-external.sh
View File

@ -1,23 +0,0 @@
#!/bin/bash
SOURCES="/opt/kolla/neutron-agents/neutron.conf /opt/kolla/neutron-agents/l3_agent.ini /opt/kolla/neutron-agents/fwaas_driver.ini"
TARGET="/etc/neutron/"
OWNER="neutron"
for f in $SOURCES; do
if [[ -f "$f" ]]; then
fname=$(basename $f)
cp $f $TARGET
chown ${OWNER}: $TARGET/$fname
chmod 0644 $TARGET/$fname
fi
done
SOURCE="/opt/kolla/neutron-agents/ml2_conf.ini"
TARGET="/etc/neutron/plugins/ml2/ml2_conf.ini"
OWNER="neutron"
if [[ -f "$SOURCE" ]]; then
cp $SOURCE $TARGET
chown ${OWNER}: $TARGET
chmod 0644 $TARGET
fi

34
docker/neutron/neutron-agents/neutron-l3-agent/start.sh
View File

@ -1,37 +1,11 @@
#!/bin/bash
set -o errexit
# Loading common functions.
source /opt/kolla/config-sudoers.sh
# Will be removed when this container is broken out into thin containers
CMD="/usr/bin/neutron-l3-agent"
ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini"
# Loading common functions.
source /opt/kolla/kolla-common.sh
source /opt/kolla/config-sudoers.sh
# Override set_configs() here because it doesn't work for fat containers like
# this one.
set_configs() {
case $KOLLA_CONFIG_STRATEGY in
COPY_ALWAYS)
source /opt/kolla/neutron-l3-agent/config-external.sh
;;
COPY_ONCE)
if [[ -f /configured-l3 ]]; then
echo 'INFO - Neutron-l3 has already been configured; Refusing to copy new configs'
return
fi
source /opt/kolla/neutron-l3-agent/config-external.sh
touch /configured-l3
;;
*)
echo '$KOLLA_CONFIG_STRATEGY is not set properly'
exit 1
;;
esac
}
# Execute config strategy
set_configs
exec $CMD $ARGS

13
docker/neutron/neutron-agents/neutron-metadata-agent/config-external.sh
View File

@ -1,13 +0,0 @@
#!/bin/bash
SOURCES="/opt/kolla/neutron-agents/neutron.conf /opt/kolla/neutron-agents/metadata_agent.ini"
TARGET="/etc/neutron/"
OWNER="neutron"
for f in $SOURCES; do
if [[ -f "$f" ]]; then
fname=$(basename $f)
cp $f $TARGET
chown ${OWNER}: $TARGET/$fname
chmod 0644 $TARGET/$fname
fi
done

34
docker/neutron/neutron-agents/neutron-metadata-agent/start.sh
View File

@ -1,37 +1,11 @@
#!/bin/bash
set -o errexit
# Loading common functions.
source /opt/kolla/config-sudoers.sh
# Will be removed when this container is broken out in thin containers
CMD="/usr/bin/neutron-metadata-agent"
ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini"
# Loading common functions.
source /opt/kolla/kolla-common.sh
source /opt/kolla/config-sudoers.sh
# Override set_configs() here because it doesn't work for fat containers like
# this one.
set_configs() {
case $KOLLA_CONFIG_STRATEGY in
COPY_ALWAYS)
source /opt/kolla/neutron-metadata-agent/config-external.sh
;;
COPY_ONCE)
if [[ -f /configured-md ]]; then
echo 'INFO - Neutron-metadata has already been configured; Refusing to copy new configs'
return
fi
source /opt/kolla/neutron-metadata-agent/config-external.sh
touch /configured-md
;;
*)
echo '$KOLLA_CONFIG_STRATEGY is not set properly'
exit 1
;;
esac
}
# Execute config strategy
set_configs
exec $CMD $ARGS

7
docker/neutron/neutron-agents/start.sh Executable file
View File

@ -0,0 +1,7 @@
#!/bin/bash
set -o errexit
# Loading common functions.
source /opt/kolla/kolla-common.sh
exec /usr/bin/supervisord