← Back to branch summary

~niedbalski/charms/trusty/quantum-gateway/fix-lp-1308557

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/openstack/neutron.py

  • Committer: James Page
  • Date: 2013-11-17 21:53:21 UTC
  • mfrom: (37.1.5 quantum-gateway)
  • Revision ID: james.page@canonical.com-20131117215321-o4o6uje3itj2e4se
[gandelman-a][james-page] NVP support

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/neutron.py
34
34
            'services': ['quantum-plugin-openvswitch-agent'],
35
35
            'packages': [[headers_package(), 'openvswitch-datapath-dkms'],
36
36
                         ['quantum-plugin-openvswitch-agent']],
 
37
            'server_packages': ['quantum-server',
 
38
                                'quantum-plugin-openvswitch'],
 
39
            'server_services': ['quantum-server']
37
40
        },
38
41
        'nvp': {
39
42
            'config': '/etc/quantum/plugins/nicira/nvp.ini',
40
43
            'driver': 'quantum.plugins.nicira.nicira_nvp_plugin.'
41
44
                      'QuantumPlugin.NvpPluginV2',
 
45
            'contexts': [
 
46
                context.SharedDBContext(user=config('neutron-database-user'),
 
47
                                        database=config('neutron-database'),
 
48
                                        relation_prefix='neutron')],
42
49
            'services': [],
43
50
            'packages': [],
 
51
            'server_packages': ['quantum-server',
 
52
                                'quantum-plugin-nicira'],
 
53
            'server_services': ['quantum-server']
44
54
        }
45
55
    }
46
56
 
60
70
            'services': ['neutron-plugin-openvswitch-agent'],
61
71
            'packages': [[headers_package(), 'openvswitch-datapath-dkms'],
62
72
                         ['quantum-plugin-openvswitch-agent']],
 
73
            'server_packages': ['neutron-server',
 
74
                                'neutron-plugin-openvswitch'],
 
75
            'server_services': ['neutron-server']
63
76
        },
64
77
        'nvp': {
65
78
            'config': '/etc/neutron/plugins/nicira/nvp.ini',
66
79
            'driver': 'neutron.plugins.nicira.nicira_nvp_plugin.'
67
80
                      'NeutronPlugin.NvpPluginV2',
 
81
            'contexts': [
 
82
                context.SharedDBContext(user=config('neutron-database-user'),
 
83
                                        database=config('neutron-database'),
 
84
                                        relation_prefix='neutron')],
68
85
            'services': [],
69
86
            'packages': [],
 
87
            'server_packages': ['neutron-server',
 
88
                                'neutron-plugin-nicira'],
 
89
            'server_services': ['neutron-server']
70
90
        }
71
91
    }
72
92