Move local_ip configuration to post push

This commit is contained in:
James Page 2014-11-10 12:03:54 +00:00
parent a576bd6c53
commit a56cb89700
3 changed files with 16 additions and 5 deletions

12
hooks/fabfile.py vendored
View File

@ -5,13 +5,15 @@ from charmhelpers.fetch import (
try:
from fabric.api import (
sudo,
put
put,
env
)
except ImportError:
apt_install('fabric', fatal=True)
from fabric.api import (
sudo,
put
put,
env
)
@ -49,4 +51,8 @@ def fix_path_ownership(path, user='nova'):
def fix_ml2_plugin_config():
sudo('sed -i "s!openvswitch/ovs_neutron_plugin.ini'
'!ml2/ml2_conf.ini!g" /etc/init.d/neutron-openvswitch-agent')
'!ml2/ml2_conf.ini!g" /etc/init.d/neutron-openvswitch-agent')
def fix_local_ip(f):
sudo('sed -i "s!LOCAL_IP!%s!g" %s' % (env.host, f))

View File

@ -20,7 +20,8 @@ from fabfile import (
enable_shell,
disable_shell,
fix_path_ownership,
fix_ml2_plugin_config
fix_ml2_plugin_config,
fix_local_ip
)
from nova_compute_utils import CHARM_SCRATCH_DIR
@ -126,6 +127,10 @@ class POWERProxy():
for f in CONFIG_FILES:
if os.path.exists("%s%s" % (CHARM_SCRATCH_DIR, f)):
self.copy_file(f)
self._fixup_local_ips()
def _fixup_local_ips(self):
execute(fix_local_ip, '/etc/neutron/plugins/ml2/ml2_conf.ini')
def _render_template(template_name, context, template_dir=TEMPLATE_DIR):

View File

@ -22,7 +22,7 @@ flat_networks = physnet1
[ovs]
enable_tunneling = True
local_ip = {{ local_ip }}
local_ip = LOCAL_IP
bridge_mappings = physnet1:br-data
[agent]