consolidated all sdn 01-deploybundl.sh in joid/ci/01-deploybundle.sh

Change-Id: Ic76bc50721e0c1f022d1ff877bf0faef7dd6e240

1 files changed, 0 insertions, 300 deletions

diff --git a/ci/nosdn/juju-deployer/ovs.yaml b/ci/nosdn/juju-deployer/ovs.yaml
deleted file mode 100644
index b7d127d1..00000000
--- a/ci/nosdn/juju-deployer/ovs.yaml
+++ /dev/null
@@ -1,300 +0,0 @@
-# vim: set ts=2 et:
-openstack-phase1:
-  series: trusty
-  services:
-    nodes-api:
-      charm: "cs:trusty/ubuntu"
-      num_units: 1
-      constraints: tags=control
-    nodes-compute:
-      charm: "cs:trusty/ubuntu"
-      num_units: 1
-      constraints: tags=compute
-    "ntp": 
-      charm: "cs:trusty/ntp"
-  relations:
-    - - "ntp:juju-info"
-      - "nodes-api:juju-info"
-    - - "ntp:juju-info"
-      - "nodes-compute:juju-info"
-openstack-phase2: 
-  inherits: openstack-phase1
-  services:
-    ceilometer:
-      charm: cs:trusty/ceilometer
-      num_units: 1
-      to:
-        - "lxc:nodes-api=0"
-    ceilometer-agent:
-      charm: cs:trusty/ceilometer-agent
-    ceph:
-      charm: cs:trusty/ceph
-      num_units: 1
-      options:
-        monitor-count: 1
-        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
-        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: /srv
-        osd-reformat: 'yes'
-#        ceph-cluster-network: 192.168.0.0/24
-#        ceph-public-network: 192.168.0.0/24
-      to:
-        - "nodes-compute=0"
-    ceph-osd:
-      charm: cs:trusty/ceph-osd
-      num_units: 1
-      options:
-        osd-devices: /srv
-        osd-reformat: 'yes'
-      to:
-        - "nodes-api=0"
-    ceph-radosgw:
-      charm: cs:trusty/ceph-radosgw
-      num_units: 1
-      options:
-        use-embedded-webserver: true
-        operator-roles: "Member,admin"
-      to:
-        - "lxc:nodes-api=0"
-    cinder:
-      charm: cs:trusty/cinder
-      num_units: 1
-      options:
-        block-device: None
-        glance-api-version: 2
-        ha-mcastport: 5401
-      to:
-        - "lxc:nodes-api=0"
-    cinder-ceph:
-      charm: cs:trusty/cinder-ceph
-      num_units: 0
-    glance:
-      charm: cs:trusty/glance
-      num_units: 1
-      options:
-        ha-mcastport: 5402
-      to:
-        - "lxc:nodes-api=0"
-    keystone:
-      charm: cs:trusty/keystone
-      num_units: 1
-      options:
-        admin-password: openstack
-        admin-token: admin
-        ha-mcastport: 5403
-      to:
-        - "lxc:nodes-api=0"
-    mongodb:
-      charm: cs:trusty/mongodb
-      num_units: 1
-      to:
-        - "lxc:nodes-api=0"
-    mysql:
-      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
-      num_units: 1
-      options:
-        max-connections: 20000
-      to:
-        - "lxc:nodes-api=0"
-    neutron-api:
-      charm: cs:trusty/neutron-api
-      num_units: 1
-      options:
-        neutron-security-groups: true
-      to:
-        - "lxc:nodes-api=0"
-    neutron-gateway:
-      charm: cs:trusty/neutron-gateway
-      num_units: 1
-      options:
-        instance-mtu: 1400
-#        "ext-port": "eth1"
-      to:
-        - "nodes-api=0"
-    neutron-openvswitch:
-      charm: cs:trusty/neutron-openvswitch
-      num_units: 0
-    nova-cloud-controller:
-      charm: cs:trusty/nova-cloud-controller
-      num_units: 1
-      options:
-        network-manager: Neutron
-        quantum-security-groups: 'yes'
-      to:
-        - "lxc:nodes-api=0"
-    nova-compute:
-      charm: cs:trusty/nova-compute
-      num_units: 1
-      options:
-        enable-live-migration: true
-        enable-resize: true
-        manage-neutron-plugin-legacy-mode: false
-        migration-auth-type: ssh
-      to:
-        - "nodes-compute=0"
-#        - "nodes-compute=1"
-#        - "nodes-api=0"
-#        - "nodes-api=1"
-#        - "nodes-api=2"
-    openstack-dashboard:
-      charm: cs:trusty/openstack-dashboard
-      num_units: 1
-      options:
-        secret: admin
-        webroot: /
-      to:
-        - "lxc:nodes-api=0"
-    rabbitmq-server:
-      charm: cs:trusty/rabbitmq-server
-      num_units: 1
-      to:
-        - "lxc:nodes-api=0"
-    heat:
-      charm: cs:trusty/heat
-      to:
-        - "lxc:nodes-api=0"
-  relations:
-    - - nova-compute:amqp
-      - rabbitmq-server:amqp
-    - - neutron-gateway:amqp
-      - rabbitmq-server:amqp
-    - - keystone:shared-db
-      - mysql:shared-db
-    - - nova-cloud-controller:identity-service
-      - keystone:identity-service
-    - - glance:identity-service
-      - 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
-      - rabbitmq-server:amqp
-    - - nova-cloud-controller:image-service
-      - glance:image-service
-    - - nova-compute:image-service
-      - glance:image-service
-    - - nova-cloud-controller:cloud-compute
-      - 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
-      - mysql:shared-db
-    - - nova-cloud-controller:neutron-api
-      - neutron-api:neutron-api
-    - - 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
-    - - ntp:juju-info
-      - nova-compute:juju-info
-    - - ntp:juju-info
-      - neutron-gateway:juju-info
-    - - ceph-radosgw:mon
-      - ceph:radosgw
-    - - ceph-radosgw:identity-service
-      - keystone:identity-service
-    - - 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
-trusty-liberty-nodes:
-  inherits: openstack-phase1
-  overrides:
-    series: trusty
-
-trusty-liberty:
-  inherits: openstack-phase2
-  overrides:
-    #os-data-network: 10.4.8.0/21
-    #prefer-ipv6: true
-    region: Canonical
-    source: "cloud:trusty-liberty"
-    "openstack-origin": "cloud:trusty-liberty"
-    series: trusty
-    ceph-osd-replication-count: 1
-    admin-role: admin
-    keystone-admin-role: admin
-
-trusty-kilo-nodes:
-  inherits: openstack-phase1
-  overrides:
-    series: trusty
-
-trusty-kilo:
-  inherits: openstack-phase2
-  overrides:
-    #os-data-network: 10.4.8.0/21
-    #prefer-ipv6: true
-    region: Canonical
-    source: "cloud:trusty-kilo"
-    "openstack-origin": "cloud:trusty-kilo"
-    series: trusty
-    ceph-osd-replication-count: 1
-    admin-role: admin
-    keystone-admin-role: admin
-
-trusty-juno-nodes:
-  inherits: openstack-phase1
-  overrides:
-    series: trusty
-
-trusty-juno:
-  inherits: openstack-phase2
-  overrides:
-    #os-data-network: 10.4.8.0/21
-    #prefer-ipv6: true
-    region: Canonical
-    source: "cloud:trusty-juno"
-    "openstack-origin": "cloud:trusty-juno"
-    series: trusty
-    ceph-osd-replication-count: 1
-    admin-role: admin
-    keystone-admin-role: admin
-