1 files changed, 0 insertions, 392 deletions
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
deleted file mode 100644
index 18a80e24..00000000
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ /dev/null
@@ -1,392 +0,0 @@
-# vim: set ts=2 et:
-trusty-mitaka-nodes:
-  inherits: openstack-phase1
-
-trusty-mitaka:
-  inherits: contrail
-  overrides:
-    #os-data-network: 10.4.8.0/21
-    #ceph-cluster-network: 10.4.0.0/21
-    #prefer-ipv6: true
-    #enable-dvr: true
-    #l2-population: true
-    region: Canonical
-    #source: "cloud:trusty-mitaka"
-    openstack-origin: "cloud:trusty-mitaka"
-    #ceph-osd-replication-count: 2
-    admin-role: admin
-    keystone-admin-role: admin
-
-openstack-phase1:
-  services:
-    nodes:
-      charm: "cs:trusty/ubuntu"
-      num_units: 5
-    ntp:
-      charm: "local:trusty/ntp"
-      options:
-        source: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org"
-        auto_peers: false
-    zookeeper:
-      charm: local:precise/zookeeper
-      num_units: 3
-      series: precise
-      to:
-        - "lxc:nodes=0"
-        - "lxc:nodes=1"
-        - "lxc:nodes=2"
-    cassandra:
-      charm: local:trusty/cassandra
-      num_units: 3
-      to:
-        - "lxc:nodes=1"
-        - "lxc:nodes=2"
-        - "lxc:nodes=3"
-      options:
-        authenticator: AllowAllAuthenticator
-  relations:
-    - - "ntp:juju-info"
-      - "nodes:juju-info"
-    - - "ntp:juju-info"
-      - "nodes:juju-info"
-
-contrail:
-  inherits: openstack-phase2
-  overrides:
-    admin-role: admin
-  relations:
-    - [ "contrail-configuration:cassandra", "cassandra:database" ]
-    - [ contrail-configuration, zookeeper ]
-    - [ contrail-configuration, rabbitmq-server ]
-    - [ contrail-configuration, keystone ]
-    - [ neutron-api-contrail, contrail-configuration ]
-    - [ neutron-api-contrail, keystone ]
-    - [ "contrail-control:contrail-api", "contrail-configuration:contrail-api" ]
-    - [ "contrail-control:contrail-discovery", "contrail-configuration:contrail-discovery" ]
-    - [ "contrail-control:contrail-ifmap", "contrail-configuration:contrail-ifmap" ]
-    - [ contrail-control, keystone ]
-    - [ "contrail-analytics:cassandra", "cassandra:database" ]
-    - [ "contrail-analytics:contrail-analytics-api", "contrail-configuration:contrail-analytics-api" ]
-    - [ "contrail-configuration:contrail-discovery", "contrail-analytics:contrail-discovery" ]
-    - [ contrail-webui, keystone ]
-    - [ "contrail-webui:contrail_api", "contrail-configuration:contrail-api" ]
-    - [ "contrail-webui:contrail_discovery", "contrail-configuration:contrail-discovery" ]
-    - [ "contrail-webui:cassandra", "cassandra:database" ]
-    - [ nova-compute, neutron-contrail ]
-    - [ "neutron-contrail:contrail-discovery", "contrail-configuration:contrail-discovery" ]
-    - [ "neutron-contrail:contrail-api", "contrail-configuration:contrail-api" ]
-    - [ neutron-contrail, keystone ]
-    - [ contrail-configuration, ntp ]
-    - [ contrail-control, ntp ]
-    - [ contrail-analytics, ntp ]
-    - [ contrail-configuration, haproxy ]
-    - [ contrail-analytics, haproxy ]
-    - [ contrail-webui, haproxy ]
-    - [ haproxy, keepalived ]
-  services:
-    contrail-configuration:
-      charm: local:trusty/contrail-configuration
-      num_units: 3
-      options:
-        vip: 10.4.1.18
-      to:
-        - "lxc:nodes=2"
-        - "lxc:nodes=3"
-        - "lxc:nodes=4"
-    contrail-control:
-      charm: local:trusty/contrail-control
-      num_units: 3
-      to:
-        - "lxc:nodes=3"
-        - "lxc:nodes=4"
-        - "lxc:nodes=0"
-    contrail-analytics:
-      charm: local:trusty/contrail-analytics
-      num_units: 3
-      to:
-        - "lxc:nodes=4"
-        - "lxc:nodes=0"
-        - "lxc:nodes=1"
-    contrail-webui:
-      charm: local:trusty/contrail-webui
-      num_units: 3
-      to:
-        - "lxc:nodes=0"
-        - "lxc:nodes=1"
-        - "lxc:nodes=2"
-    neutron-api-contrail:
-      charm: local:trusty/neutron-api-contrail
-    neutron-contrail:
-      charm: local:trusty/neutron-contrail
-    haproxy:
-      charm: local:trusty/haproxy
-      num_units: 3
-      options:
-        peering_mode: active-active
-      to:
-        - "lxc:nodes=1"
-        - "lxc:nodes=2"
-        - "lxc:nodes=3"
-    keepalived:
-      charm: local:trusty/keepalived
-      options:
-        virtual-ip: 10.4.1.19
-
-openstack-phase2:
-  inherits: openstack-phase1
-  relations:
-    - [ "mysql:ha", "hacluster-mysql:ha" ]
-    - [ "glance:ha", "hacluster-glance:ha" ]
-    - [ "keystone:ha", "hacluster-keystone:ha" ]
-    - [ "neutron-api:ha", "hacluster-neutron:ha" ]
-    - [ "nova-cloud-controller:ha", "hacluster-nova:ha" ]
-    - [ "openstack-dashboard:ha", "hacluster-horizon:ha" ]
-    - [ "ceilometer:ha", "hacluster-ceilometer:ha" ]
-    - [ keystone, mysql ]
-    - [ nova-cloud-controller, mysql ]
-    - [ nova-cloud-controller, rabbitmq-server ]
-    - [ nova-cloud-controller, glance ]
-    - [ nova-cloud-controller, keystone ]
-    - [ nova-compute, nova-cloud-controller ]
-    - [ "nova-compute:shared-db", "mysql:shared-db" ]
-    - [ "nova-compute:amqp", "rabbitmq-server:amqp" ]
-    - [ nova-compute, glance ]
-    - [ glance, mysql ]
-    - [ glance, keystone ]
-    - [ openstack-dashboard, keystone ]
-    - [ neutron-api, mysql ]
-    - [ neutron-api, rabbitmq-server ]
-    - [ neutron-api, nova-cloud-controller ]
-    - [ neutron-api, keystone ]
-    - [ neutron-api, neutron-api-contrail ]
-    - [ "ceilometer:amqp", "rabbitmq-server:amqp" ]
-    - [ "ceilometer-agent:ceilometer-service", "ceilometer:ceilometer-service" ]
-    - [ "ceilometer:identity-service", "keystone:identity-service" ]
-    - [ "ceilometer:identity-notifications", "keystone:identity-notifications" ]
-    - [ "ceilometer-agent:nova-ceilometer", "nova-compute:nova-ceilometer" ]
-    - [ "ceilometer:shared-db", "mongodb:database" ]
-    - [ "heat:shared-db", "mysql:shared-db" ]
-    - [ "heat:identity-service", "keystone:identity-service" ]
-    - [ "heat:amqp", "rabbitmq-server:amqp" ]
-    - [ "cinder:image-service", "glance:image-service" ]
-    - [ "cinder:amqp", "rabbitmq-server:amqp" ]
-    - [ "cinder:identity-service", "keystone:identity-service" ]
-    - [ "cinder:cinder-volume-service", "nova-cloud-controller:cinder-volume-service" ]
-    - [ "cinder-ceph:storage-backend", "cinder:storage-backend" ]
-    - [ "ceph:client", "nova-compute:ceph" ]
-    - [ "cinder:shared-db", "mysql:shared-db" ]
-    - [ "ceph:client", "cinder-ceph:ceph" ]
-    - [ "ceph:client", "glance:ceph" ]
-    - [ "ceph-osd:mon", "ceph:osd" ]
-    - [ "ceph-radosgw:mon", "ceph:radosgw" ]
-    - [ "ceph-radosgw:identity-service", "keystone:identity-service" ]
-    #- - nova-compute:lxd
-      #- lxd:lxd
-    - - congress:shared-db
-      - mysql:shared-db
-    - - congress:identity-service
-      - keystone:identity-service
-    - - congress:amqp
-      - rabbitmq-server:amqp
-
-  services:
-    mysql:
-      charm: "local:trusty/percona-cluster"
-      num_units: 3
-      options:
-        dataset-size: 2G
-        lp1366997-workaround: true
-        max-connections: 10000
-        root-password: 293rhc395m
-        sst-password: 127rc14t51
-        vip: 10.4.1.15
-      to:
-        - "lxc:nodes=2"
-        - "lxc:nodes=3"
-        - "lxc:nodes=4"
-    hacluster-keystone:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_transport: unicast
-        cluster_count: 3
-    hacluster-horizon:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_transport: unicast
-        cluster_count: 3
-    hacluster-nova:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_transport: unicast
-        cluster_count: 3
-    hacluster-neutron:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_transport: unicast
-        cluster_count: 3
-    hacluster-glance:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_transport: unicast
-        cluster_count: 3
-    hacluster-ceilometer:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_transport: unicast
-        cluster_count: 3
-    hacluster-mysql:
-      charm: "local:trusty/hacluster"
-      options:
-        corosync_transport: unicast
-        cluster_count: 3
-    ceilometer:
-      charm: "local:trusty/ceilometer"
-      num_units: 3
-      options:
-        vip: 10.4.1.14
-      to:
-        - "lxc:nodes=3"
-        - "lxc:nodes=4"
-        - "lxc:nodes=0"
-    ceilometer-agent:
-      charm: "local:trusty/ceilometer-agent"
-    mongodb:
-      charm: "cs:trusty/mongodb"
-      num_units: 1
-      to:
-        - "lxc:nodes=0"
-    heat:
-      charm: "local:trusty/heat"
-      to:
-        - "lxc:nodes=0"
-    ceph:
-      charm: local:trusty/ceph
-      num_units: 3
-      options:
-        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
-        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        monitor-count: 3
-#        osd-reformat: 'no'
-#        ceph-cluster-network: 192.168.0.0/24
-#        ceph-public-network: 192.168.0.0/24
-      to:
-        - "lxc:nodes=4"
-        - "lxc:nodes=0"
-        - "lxc:nodes=1"
-    ceph-osd:
-      charm: local:trusty/ceph-osd
-      num_units: 3
-      options:
-        osd-devices: /srv
-        osd-reformat: 'yes'
-      to:
-        - "nodes=2"
-        - "nodes=3"
-        - "nodes=4"
-    ceph-radosgw:
-      charm: local:trusty/ceph-radosgw
-      options:
-        use-embedded-webserver: true
-        operator-roles: "Member,admin"
-      to:
-        - "lxc:nodes=0"
-    cinder:
-      charm: local:trusty/cinder
-      num_units: 3
-      options:
-        block-device: None
-        glance-api-version: 2
-      to:
-        - "lxc:nodes=0"
-        - "lxc:nodes=1"
-        - "lxc:nodes=2"
-    cinder-ceph:
-      charm: local:trusty/cinder-ceph
-    rabbitmq-server: 
-      charm: local:trusty/rabbitmq-server
-      num_units: 3
-      options:
-        vip: 10.4.1.10
-      to:
-        - "lxc:nodes=1"
-        - "lxc:nodes=2"
-        - "lxc:nodes=3"
-    keystone: 
-      charm: local:trusty/keystone
-      num_units: 3
-      options: 
-        admin-password: openstack
-        admin-token: admin
-        vip: 10.4.1.13
-      to:
-        - "lxc:nodes=2"
-        - "lxc:nodes=3"
-        - "lxc:nodes=4"
-    openstack-dashboard: 
-      charm: local:trusty/openstack-dashboard
-      num_units: 3
-      options: 
-        secret: admin
-        vip: 10.4.1.11
-        webroot: /
-      to:
-        - "lxc:nodes=3"
-        - "lxc:nodes=4"
-        - "lxc:nodes=0"
-    nova-compute:
-      charm: local:trusty/nova-compute
-      num_units: 4
-      options:
-        enable-live-migration: False
-        manage-neutron-plugin-legacy-mode: False
-        migration-auth-type: ssh
-        #hugepages: "50%"
-        #virt-type: lxd
-      to:
-        - "nodes=1"
-        - "nodes=2"
-        - "nodes=3"
-        - "nodes=4"
-    nova-cloud-controller:
-      charm: local:trusty/nova-cloud-controller
-      num_units: 3
-      options:
-        console-access-protocol: novnc
-        network-manager: Neutron
-        service-guard: true
-        vip: 10.4.1.16
-      to:
-        - "lxc:nodes=4"
-        - "lxc:nodes=0"
-        - "lxc:nodes=1"
-    neutron-api:
-      charm: local:trusty/neutron-api
-      num_units: 3
-      options:
-        neutron-security-groups: True
-        manage-neutron-plugin-legacy-mode: False
-        vip: 10.4.1.17
-      to:
-        - "lxc:nodes=0"
-        - "lxc:nodes=1"
-        - "lxc:nodes=2"
-    glance:
-      charm: local:trusty/glance
-      num_units: 3
-      options:
-        vip: 10.4.1.12
-      to:
-        - "lxc:nodes=1"
-        - "lxc:nodes=2"
-        - "lxc:nodes=3"
-    opnfv-promise:
-      charm: local:trusty/promise
-      num_units: 1
-      to:
-        - "lxc:nodes=0"
-    congress:
-      charm: local:trusty/congress
-      options:
-        #source-branch: stable/mitaka
-      to:
-        - "lxc:nodes=0"