← Back to branch summary

~1chb1n/charms/trusty/nova-compute/next-amulet-lp1440953

« back to all changes in this revision

Viewing changes to hooks/nova_compute_utils.py

  • Committer: Edward Hope-Morley
  • Date: 2015-03-12 10:07:02 UTC
  • mto: This revision was merged to the branch mainline in revision 108.
  • Revision ID: edward.hope-morley@canonical.com-20150312100702-amt7ptxb35g76a75
removed phy-nic* options since handled by ovs plugin charm

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/nova_compute_utils.py
46
46
    CEPH_CONF,
47
47
    ceph_config_file,
48
48
    HostIPContext,
49
 
    PhyNICMTUContext,
50
49
)
51
50
 
52
51
CA_CERT_PATH = '/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt'
53
52
 
54
 
PHY_NIC_MTU_CONF = '/etc/init/os-charm-phy-nic-mtu.conf'
55
53
TEMPLATES = 'templates/'
56
54
 
57
55
BASE_PACKAGES = [
119
117
                     context.AMQPContext(ssl_dir=QUANTUM_CONF_DIR),
120
118
                     context.SyslogContext()],
121
119
    },
122
 
    PHY_NIC_MTU_CONF: {
123
 
        'services': ['os-charm-phy-nic-mtu'],
124
 
        'contexts': [PhyNICMTUContext()],
125
 
    }
126
120
}
127
121
 
128
122
NEUTRON_CONF_DIR = "/etc/neutron"
135
129
                     context.AMQPContext(ssl_dir=NEUTRON_CONF_DIR),
136
130
                     context.SyslogContext()],
137
131
    },
138
 
    PHY_NIC_MTU_CONF: {
139
 
        'services': ['os-charm-phy-nic-mtu'],
140
 
        'contexts': [PhyNICMTUContext()],
141
 
    }
142
132
}
143
133
 
144
134