diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-neutron_git.bb')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-neutron_git.bb | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index ab803f8..5fbad17 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb | |||
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/icehouse \ | |||
14 | file://neutron-agent.init \ | 14 | file://neutron-agent.init \ |
15 | file://l3_agent.ini \ | 15 | file://l3_agent.ini \ |
16 | file://dhcp_agent.ini \ | 16 | file://dhcp_agent.ini \ |
17 | file://metadata_agent.ini \ | ||
17 | file://neutron-dhcp-agent-netns-cleanup.cron \ | 18 | file://neutron-dhcp-agent-netns-cleanup.cron \ |
18 | file://0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch \ | 19 | file://0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch \ |
19 | " | 20 | " |
@@ -91,6 +92,22 @@ do_install_append() { | |||
91 | install -m 0755 ${WORKDIR}/neutron-$AGENT.init.sh ${D}${sysconfdir}/init.d/neutron-$AGENT-agent | 92 | install -m 0755 ${WORKDIR}/neutron-$AGENT.init.sh ${D}${sysconfdir}/init.d/neutron-$AGENT-agent |
92 | install -m 600 ${WORKDIR}/${AGENT}_agent.ini ${NEUTRON_CONF_DIR}/ | 93 | install -m 600 ${WORKDIR}/${AGENT}_agent.ini ${NEUTRON_CONF_DIR}/ |
93 | fi | 94 | fi |
95 | |||
96 | AGENT=metadata | ||
97 | ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/metadata_agent.ini" | ||
98 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | ||
99 | sed "s:@suffix@:$AGENT:;s:@args@:$ARGS:" < ${WORKDIR}/neutron-agent.init >${WORKDIR}/neutron-$AGENT.init.sh | ||
100 | install -m 0755 ${WORKDIR}/neutron-$AGENT.init.sh ${D}${sysconfdir}/init.d/neutron-$AGENT-agent | ||
101 | install -m 600 ${WORKDIR}/${AGENT}_agent.ini ${NEUTRON_CONF_DIR}/ | ||
102 | fi | ||
103 | sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" \ | ||
104 | -i ${NEUTRON_CONF_DIR}/metadata_agent.ini | ||
105 | sed -e "s:%SERVICE_USER%:${SRCNAME}:g" \ | ||
106 | -i ${NEUTRON_CONF_DIR}/metadata_agent.ini | ||
107 | sed -e "s:%SERVICE_PASSWORD%:${SERVICE_PASSWORD}:g" \ | ||
108 | -i ${NEUTRON_CONF_DIR}/metadata_agent.ini | ||
109 | sed -e "s:%METADATA_SHARED_SECRET%:${METADATA_SHARED_SECRET}:g" \ | ||
110 | -i ${NEUTRON_CONF_DIR}/metadata_agent.ini | ||
94 | 111 | ||
95 | cp run_tests.sh ${NEUTRON_CONF_DIR} | 112 | cp run_tests.sh ${NEUTRON_CONF_DIR} |
96 | } | 113 | } |
@@ -182,8 +199,9 @@ FILES_${SRCNAME}-l3-agent = "${bindir}/neutron-l3-agent \ | |||
182 | " | 199 | " |
183 | 200 | ||
184 | FILES_${SRCNAME}-metadata-agent = "${bindir}/neutron-metadata-agent \ | 201 | FILES_${SRCNAME}-metadata-agent = "${bindir}/neutron-metadata-agent \ |
202 | ${bindir}/neutron-ns-metadata-proxy \ | ||
185 | ${sysconfdir}/${SRCNAME}/metadata_agent.ini \ | 203 | ${sysconfdir}/${SRCNAME}/metadata_agent.ini \ |
186 | ${sysconfdir}/init.d/metadata_agent \ | 204 | ${sysconfdir}/init.d/neutron-metadata-agent \ |
187 | " | 205 | " |
188 | 206 | ||
189 | FILES_${SRCNAME}-extra-agents = "${bindir}/*" | 207 | FILES_${SRCNAME}-extra-agents = "${bindir}/*" |
@@ -233,7 +251,7 @@ RDEPENDS_${SRCNAME}-setup = "postgresql sudo" | |||
233 | 251 | ||
234 | RRECOMMENDS_${SRCNAME}-server = "${SRCNAME}-plugin-openvswitch" | 252 | RRECOMMENDS_${SRCNAME}-server = "${SRCNAME}-plugin-openvswitch" |
235 | 253 | ||
236 | INITSCRIPT_PACKAGES = "${SRCNAME}-server ${SRCNAME}-plugin-openvswitch ${SRCNAME}-plugin-linuxbridge ${SRCNAME}-dhcp-agent ${SRCNAME}-l3-agent" | 254 | INITSCRIPT_PACKAGES = "${SRCNAME}-server ${SRCNAME}-plugin-openvswitch ${SRCNAME}-plugin-linuxbridge ${SRCNAME}-dhcp-agent ${SRCNAME}-l3-agent ${SRCNAME}-metadata-agent" |
237 | INITSCRIPT_NAME_${SRCNAME}-server = "neutron-server" | 255 | INITSCRIPT_NAME_${SRCNAME}-server = "neutron-server" |
238 | INITSCRIPT_PARAMS_${SRCNAME}-server = "${OS_DEFAULT_INITSCRIPT_PARAMS}" | 256 | INITSCRIPT_PARAMS_${SRCNAME}-server = "${OS_DEFAULT_INITSCRIPT_PARAMS}" |
239 | INITSCRIPT_NAME_${SRCNAME}-plugin-openvswitch = "neutron-openvswitch-agent" | 257 | INITSCRIPT_NAME_${SRCNAME}-plugin-openvswitch = "neutron-openvswitch-agent" |
@@ -244,3 +262,5 @@ INITSCRIPT_NAME_${SRCNAME}-dhcp-agent = "neutron-dhcp-agent" | |||
244 | INITSCRIPT_PARAMS_${SRCNAME}-dhcp-agent = "${OS_DEFAULT_INITSCRIPT_PARAMS}" | 262 | INITSCRIPT_PARAMS_${SRCNAME}-dhcp-agent = "${OS_DEFAULT_INITSCRIPT_PARAMS}" |
245 | INITSCRIPT_NAME_${SRCNAME}-l3-agent = "neutron-l3-agent" | 263 | INITSCRIPT_NAME_${SRCNAME}-l3-agent = "neutron-l3-agent" |
246 | INITSCRIPT_PARAMS_${SRCNAME}-l3-agent = "${OS_DEFAULT_INITSCRIPT_PARAMS}" | 264 | INITSCRIPT_PARAMS_${SRCNAME}-l3-agent = "${OS_DEFAULT_INITSCRIPT_PARAMS}" |
265 | INITSCRIPT_NAME_${SRCNAME}-metadata-agent = "neutron-metadata-agent" | ||
266 | INITSCRIPT_PARAMS_${SRCNAME}-metadata-agent = "${OS_DEFAULT_INITSCRIPT_PARAMS}" | ||