Juju Charms Collection
neutron-contrail package

Merge lp:~majduk/charms/trusty/neutron-contrail/trunk into lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk

  1. Trusty Tahr (14.04)
  2. trunk
  3. Merge into trunk
Proposed by Michał Ajduk
Status: Merged
Merged at revision: 76
Proposed branch: lp:~majduk/charms/trusty/neutron-contrail/trunk
Merge into: lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk
Diff against target: 23 lines (+6/-0)
1 file modified
hooks/neutron_contrail_hooks.py (+6/-0)
To merge this branch: bzr merge lp:~majduk/charms/trusty/neutron-contrail/trunk
Reviewer Review Type Date Requested Status
Michał Ajduk (community) Approve
Review via email: mp+356034@code.launchpad.net

Commit message

revno: 90
committer: Michal Ajduk <email address hidden>
branch nick: neutron-contrail.bzr
timestamp: Wed 2018-10-03 10:31:49 +0200
message:
  local-metadata-server support. Setting local-metadata-server to true installs local metadata server.

Description of the change

revno: 90
committer: Michal Ajduk <email address hidden>
branch nick: neutron-contrail.bzr
timestamp: Wed 2018-10-03 10:31:49 +0200
message:
  local-metadata-server support. Setting local-metadata-server to true installs local metadata server.

To post a comment you must log in.
Revision history for this message
Michał Ajduk (majduk) wrote :

Minor change, already tested.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/neutron_contrail_hooks.py'
2--- hooks/neutron_contrail_hooks.py 2018-07-06 13:14:15 +0000
3+++ hooks/neutron_contrail_hooks.py 2018-10-03 08:35:31 +0000
4@@ -408,6 +408,9 @@
5 # contrail nova packages contain vrouter vhostuser vif
6 apt_install("nova-compute", options=["--reinstall", "--force-yes", "-o Dpkg::Options::=\"--force-confold\"", "-o Dpkg::Options::=\"--force-confdef\""],
7 fatal=True)
8+ if config["local-metadata-server"]:
9+ apt_install("nova-api-metadata", options=["--reinstall", "--force-yes"],
10+ fatal=True)
11
12 fix_kexec_tools()
13 fix_permissions()
14@@ -434,6 +437,9 @@
15 apt_install(PACKAGES_VROUTER_3_2, fatal=True)
16 else:
17 apt_install(PACKAGES_VROUTER, fatal=True)
18+ if config["local-metadata-server"]:
19+ apt_install("nova-api-metadata", options=["--reinstall", "--force-yes"],
20+ fatal=True)
21 fix_kexec_tools()
22 fix_permissions()
23 fix_nodemgr()

Subscribers

People subscribed via source and target branches