~celebdor/charms/trusty/neutron-agents-midonet/trunk

« back to all changes in this revision

Viewing changes to tests/basic_deployment.py

  • Committer: James Page
  • Date: 2016-02-16 10:00:58 UTC
  • Revision ID: james.page@ubuntu.com-20160216100058-uqfz2inj4krhx04s
Tweak charm sources

Show diffs side-by-side

added added

removed removed

Lines of Context:
60
60
        self._initialize_tests()
61
61
 
62
62
    def _add_services(self):
63
 
        self.d.add('mysql', charm='cs:trusty/mysql', units=1,
 
63
        self.d.add('mysql', charm='mysql', units=1,
64
64
                   series=self.series)
65
 
        self.d.add('keystone', charm='keystone', units=1, series=self.series,
66
 
                    branch='cs:trusty/keystone')
67
 
        self.d.add('cassandra', charm='cs:trusty/cassandra',
 
65
        self.d.add('keystone', charm='keystone', units=1, series=self.series)
 
66
        self.d.add('cassandra', charm='cassandra',
68
67
                   units=1, series=self.series)
69
 
        self.d.add('zookeeper', charm='cs:trusty/zookeeper', units=1,
70
 
                   series=self.series)
71
 
        self.d.add('rabbitmq', charm='cs:trusty/rabbitmq-server', units=1,
72
 
                   series=self.series)
73
 
        self.d.add('nova', charm='cs:trusty/nova-cloud-controller', units=1,
74
 
                   series=self.series)
75
 
        self.d.add(
76
 
            'neutron', charm='neutron-api', units=1,
77
 
            branch='lp:~openstack-charmers/charms/trusty/neutron-api/next',
78
 
            series=self.series)
 
68
        self.d.add('zookeeper', charm='zookeeper', units=1,
 
69
                   series=self.series)
 
70
        self.d.add('rabbitmq', charm='rabbitmq-server', units=1,
 
71
                   series=self.series)
 
72
        self.d.add('nova', charm='nova-cloud-controller', units=1,
 
73
                   series=self.series)
 
74
        self.d.add('neutron',
 
75
                   charm='cs:~openstack-charmers-next/trusty/neutron-api',
 
76
                   units=1,
 
77
                   series=self.series)
79
78
        self.d.add('midonet-api', charm='midonet-api',
80
79
                   branch='lp:~celebdor/charms/trusty/midonet-api/trunk',
81
80
                   series=self.series)