13 Commits

Author SHA1 Message Date
Steven Dake
f2b9292973 Fix KOLLA_CONFIG_STRATEGY in neutron agents
The change from:
I01220077d8d25db5f69802ad27e745d90826d69b

In some way was lost by the gerrit.  This patch just basically
redoes that work so the neutron agents will work properly.

Change-Id: I92ac1b8601d145a0722b37eda937ee2baac7a7c5
Closes-Bug: #1489664
2015-08-30 12:44:43 -07:00
Sam Yaple
cbd42ca6e9 Move docker_templates to docker dir
Updated build.py to reflect this change.
Deprecate --template option and make it a noop.

Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2
Partially-Implements: blueprint remove-docker-dir
2015-08-28 13:33:50 +00:00
Sam Yaple
13062e23e8 Restructure builds to allow more flexibility
As a restructure, nothing is changed from the original behaviour and
naming despite the file structure changing. The symlinks to build had
to be updated generating lots of "deleted" and "new_file".

The new structure is:

docker/${base_distro}/${type}/${container}

base_distro == centos, ubuntu, fedora, etc
type == source, binary, rdo

type rdo is a symlink to binary for backwards compatibility

Two new flags are added to the build-all script to support the ability
to support different base distros and a flag to support binary or source
containers.

There are several added folders that are empty to hold the directory
structure for future containers of these types.

To use a prefix other than centos-rdo- you can set PREFIX in the toplevel
directory .buildconf file

Change-Id: Ifc7bac0d827470f506c8b5c004a833da9ce13b90
2015-05-15 01:32:22 -05:00
Fang Fenghua
f374a02a75 linuxbridge check.sh not right
linuxbridge check.sh script got wrong
value of status.

Change-Id: I975562a62c9ebf7afc22289dc96e672ed877537c
Closes-Bug: #1452626
2015-05-08 00:32:54 +08:00
Steven Dake
2ef9203ece Move dnsmasq-neutron.conf to /etc/neutron/dnsmasq
The default dnsmasq configuration file doesn't operate with the Kilo
agents in /etc/neutron when used with the --config-dir option.  Instead move
it to a subdirectory.

Change-Id: Iab8a54e879f8e630ba38205750ca9670e82834df
Partially-Implements: blueprint port-kilo
2015-05-06 13:54:04 -07:00
Steven Dake
4942e642cf The Neutron agents need their configuration directory specified
Add a --config-dir specification to each agent run.

Change-Id: I0426caf2ca17185c0789753d4aa9637c5b4327ec
Partially-Implements: blueprint port-kilo
2015-05-06 13:54:04 -07:00
Steven Dake
dd06c2347b The neutron dockerfile needs an update for Kilo
policy.json comes from the openstack-neutron package and is required
for the agents to run.  So install it.  fwaas_driver.ini has been deleted
in master and in the kilo branch, but the agents won't run without the
file present.  So copy one from the Juno release.

fwaas_driver.ini is probably not actually required, but there is a
configuration problem somewhere in our Neutron code base.  We are out
of time for the Kilo branch, so this short term workaround should be fine.

Change-Id: I154599925308765349634b1a53e598599fc20ec1
Partially-Implements: blueprint port-kilo
2015-05-06 13:54:04 -07:00
Steven Dake
d30f69bc83 Port to icehouse
This represents making build-docker-images --release build
with the icehouse tag and causes docker-compsoe to pull from
the icehouse tag.

Partially-implements: blueprint port-kilo

Change-Id: I66b2c39abc55c0f47152dd90e696fc46b9c58f50
2015-05-06 09:58:43 -07:00
Chen Zhiwei
76c1fe6371 Change the default shell to bash
Unify the shell to bash in all Kolla scripts.

Change-Id: Ib9591b2f8f344eb88455c5e9b7ecf2164fb5960a
Implements: blueprint use-bash-shell
2015-04-27 13:26:37 +08:00
Daneyon Hansen
17fc2d9b47 Removes existing network namespaces for neutron-agents container
Previously, network namespaces would not work correctly when
restarting or stop/rm/start the neutron-agents container. This
is because network namespaces created within the container are
associated to the container's pid: /pid/$CONTAINER_PID/ns/net.
With this patch, when a container starts or restarts, the l3/dhcp
agent start scripts will remove any existing qrouter/qdhcp network
namespaces before starting the agents. The agents will recreate the
necessary network namespaces since they are stored in the db.

Closes-Bug: 1444219

Change-Id: Ia86729766fe8c2fc145b3a02d519746b149a73bb
2015-04-21 07:50:48 +00:00
Steven Dake
64a2cf40a5 Add workaround to work with cirros image
The cirros image uses an old dhcp client which does not work
properly with hardware that has checksum offload enabled.  Add
a bootp rule to rewrite the checksum via iptables.

Latest cirros 0.3.33 is afflicted by this bug.

Change-Id: Ibfd1f87af5d0bef9fcb1354121e76e4e0db8ab5e
2015-04-15 19:18:41 -07:00
Steven Dake
095fbd7d7c Neutron doa in current form
The nova-config.sh script was exiting because of incorrect shell syntax.

The correct syntax for a regex search is
[[ haystack =~ needle ]].  The .*needle.* is unnecessary.  I think this shell
script exited because a period was missing.

Change-Id: I3aca5e0729eb5fedbe9ecb4d75ed85d5a1c7815a
2015-04-14 18:55:48 -07:00
Daneyon Hansen
ed107a5e26 Adds Neutron Agents Support
Previously, the agents ran in seperate containers. Since some of
the agents create and use network namespaces, runnning them in
seperate containers has become a challenge. This patch adds
neutron agent support in a single container.

Partially Implements: blueprint compute-operation-neutron

Change-Id: If4f893abd50d90b58e8435ec2659870dce36951c
2015-04-13 07:34:12 +00:00