Template the bundle file
diff --git a/cord.yaml b/templates/cord.yaml
similarity index 80%
rename from cord.yaml
rename to templates/cord.yaml
index 08f9cfb..1efb0b0 100644
--- a/cord.yaml
+++ b/templates/cord.yaml
@@ -19,13 +19,9 @@
constraints: arch=amd64
'10':
constraints: arch=amd64
- '11':
- constraints: arch=amd64
relations:
- - nova-compute:amqp
- rabbitmq-server:amqp
-- - neutron-gateway:amqp
- - rabbitmq-server:amqp
- - keystone:shared-db
- mysql:shared-db
- - nova-cloud-controller:identity-service
@@ -34,14 +30,10 @@
- keystone:identity-service
- - neutron-api:identity-service
- keystone:identity-service
-- - neutron-openvswitch:neutron-plugin-api
- - neutron-api:neutron-plugin-api
- - neutron-api:shared-db
- mysql:shared-db
- - neutron-api:amqp
- rabbitmq-server:amqp
-- - neutron-gateway:neutron-plugin-api
- - neutron-api:neutron-plugin-api
- - glance:shared-db
- mysql:shared-db
- - glance:amqp
@@ -54,12 +46,6 @@
- nova-compute:cloud-compute
- - nova-cloud-controller:amqp
- rabbitmq-server:amqp
-- - nova-cloud-controller:quantum-network-service
- - neutron-gateway:quantum-network-service
-- - nova-compute:neutron-plugin
- - neutron-openvswitch:neutron-plugin
-- - neutron-openvswitch:amqp
- - rabbitmq-server:amqp
- - openstack-dashboard:identity-service
- keystone:identity-service
- - nova-cloud-controller:shared-db
@@ -68,8 +54,6 @@
- neutron-api:neutron-api
- - ntp:juju-info
- nova-compute:juju-info
-- - ntp:juju-info
- - neutron-gateway:juju-info
- - nagios
- nrpe
- - mysql:juju-info
@@ -82,8 +66,6 @@
- nrpe
- - nova-cloud-controller
- nrpe
-- - neutron-gateway
- - nrpe
- - openstack-dashboard
- nrpe
- - neutron-api
@@ -114,7 +96,7 @@
options:
openstack-origin: cloud:trusty-kilo
to:
- - '8'
+ - '7'
ceilometer-agent:
charm: cs:trusty/ceilometer-agent-13
num_units: 0
@@ -133,7 +115,7 @@
annotations:
gui-x: '500'
gui-y: '0'
- charm: cs:trusty/keystone-31
+ charm: cs:trusty/keystone-33
num_units: 1
options:
admin-password: 'ADMIN_PASS'
@@ -147,7 +129,7 @@
charm: cs:trusty/mongodb-33
num_units: 1
to:
- - '8'
+ - '7'
mysql:
annotations:
gui-x: '0'
@@ -162,35 +144,21 @@
charm: cs:trusty/nagios-10
num_units: 1
to:
- - '9'
+ - '8'
neutron-api:
annotations:
gui-x: '500'
gui-y: '500'
- charm: cs:trusty/neutron-api-21
+ charm: cs:~cordteam/trusty/neutron-api-1
num_units: 1
options:
- #neutron-security-groups: true
+ neutron-plugin: onosvtn
+ onos-vtn-ip: {{ onos_cord_ip.stdout }}
+ neutron-security-groups: true
openstack-origin: cloud:trusty-kilo
+ overlay-network-type: vxlan
to:
- - '10'
- neutron-gateway:
- annotations:
- gui-x: '0'
- gui-y: '0'
- charm: cs:trusty/neutron-gateway-7
- num_units: 1
- options:
- #ext-port: eth1
- openstack-origin: cloud:trusty-kilo
- to:
- - '6'
- neutron-openvswitch:
- annotations:
- gui-x: '250'
- gui-y: '500'
- charm: cs:trusty/neutron-openvswitch-13
- num_units: 0
+ - '9'
nova-cloud-controller:
annotations:
gui-x: '0'
@@ -198,7 +166,7 @@
charm: cs:trusty/nova-cloud-controller-64
num_units: 1
options:
- config-flags: "force_config_drive = always"
+ config-flags: "force_config_drive=always"
console-access-protocol: novnc
network-manager: Neutron
openstack-origin: cloud:trusty-kilo
@@ -220,7 +188,7 @@
openstack-origin: cloud:trusty-kilo
#manage-neutron-plugin-legacy-mode: False
to:
- - '11'
+ - '10'
nrpe:
charm: cs:trusty/nrpe-4
num_units: 0
@@ -239,7 +207,7 @@
options:
openstack-origin: cloud:trusty-kilo
to:
- - '7'
+ - '6'
rabbitmq-server:
annotations:
gui-x: '500'