diff options
author | 2015-08-29 14:31:22 -0500 | |
---|---|---|
committer | 2015-08-29 14:36:03 -0500 | |
commit | b5c5f74a35b7c2a3413bfac94811d8e6035aa3ae (patch) | |
tree | 56745cbb089883fb3c5708c654136b31bcd51fc4 /ci/intel/pod5/kilo | |
parent | 62101c28c8245ebe97c548669c27cd2899cbfbab (diff) |
restructure the directory structure so that we can have directories per
SDN and then we can have same structure for new distro by adding just
the yaml file. Deleted the old file structure.
Change-Id: Ibd544c340fdb53813bc34ee8ff6931ed4b4dee6c
JIRA:JOID-1
Diffstat (limited to 'ci/intel/pod5/kilo')
-rw-r--r-- | ci/intel/pod5/kilo/odl/deploy.sh | 14 | ||||
-rw-r--r-- | ci/intel/pod5/kilo/odl/environment.yaml | 36 | ||||
-rw-r--r-- | ci/intel/pod5/kilo/odl/ha/deploy.sh | 13 | ||||
-rw-r--r-- | ci/intel/pod5/kilo/odl/ha/environment.yaml | 36 | ||||
-rw-r--r-- | ci/intel/pod5/kilo/odl/ha/ovs-odl.yaml | 101 | ||||
-rw-r--r-- | ci/intel/pod5/kilo/odl/ovs-odl.yaml | 101 |
6 files changed, 0 insertions, 301 deletions
diff --git a/ci/intel/pod5/kilo/odl/deploy.sh b/ci/intel/pod5/kilo/odl/deploy.sh deleted file mode 100644 index 1c80d978..00000000 --- a/ci/intel/pod5/kilo/odl/deploy.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -#placeholder for deployment script. -set -ex - -cp intel/pod5/kilo/odl/ovs-odl.yaml ./ - -echo "... Deployment Started ...." - -JUJU_REPOSITORY= -juju set-constraints tags= - -juju-deployer -d -r 13 -c ovs-odl.yaml trusty-kilo - -echo "... Deployment finished ...." diff --git a/ci/intel/pod5/kilo/odl/environment.yaml b/ci/intel/pod5/kilo/odl/environment.yaml deleted file mode 100644 index 10f7637b..00000000 --- a/ci/intel/pod5/kilo/odl/environment.yaml +++ /dev/null @@ -1,36 +0,0 @@ -default: maas -environments: - # https://juju.ubuntu.com/docs/config-maas.html - maas: - type: maas - - # maas-server specifies the location of the MAAS server. It must - # specify the base path. - # - maas-server: 'http://10.4.1.1/MAAS/' - - # maas-oauth holds the OAuth credentials from MAAS. - # - maas-oauth: 'c6tcQz4tyS3ALajCtF:sqcWhw8MkxTjUDLZrm:hBhszBLv5EqrY8h6yktFXWUT5825ShvE' - - # maas-server bootstrap ssh connection options - # - - # bootstrap-timeout time to wait contacting a state server, in seconds. - bootstrap-timeout: 1800 - admin-secret: admin - - # Whether or not to refresh the list of available updates for an - # OS. The default option of true is recommended for use in - # production systems, but disabling this can speed up local - # deployments for development or testing. - # - enable-os-refresh-update: false - - # Whether or not to perform OS upgrades when machines are - # provisioned. The default option of true is recommended for use - # in production systems, but disabling this can speed up local - # deployments for development or testing. - # - enable-os-upgrade: false - diff --git a/ci/intel/pod5/kilo/odl/ha/deploy.sh b/ci/intel/pod5/kilo/odl/ha/deploy.sh deleted file mode 100644 index 5e8044be..00000000 --- a/ci/intel/pod5/kilo/odl/ha/deploy.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -#placeholder for deployment script. -set -ex - -cp intel/pod5/kilo/odl/ha/ovs-odl.yaml ./ - -echo "Deployment Started ...." - -JUJU_REPOSITORY= -juju set-constraints tags= -juju-deployer -d -r 13 -c ovs-odl.yaml trusty-kilo - -echo "... Deployment finished" diff --git a/ci/intel/pod5/kilo/odl/ha/environment.yaml b/ci/intel/pod5/kilo/odl/ha/environment.yaml deleted file mode 100644 index 10f7637b..00000000 --- a/ci/intel/pod5/kilo/odl/ha/environment.yaml +++ /dev/null @@ -1,36 +0,0 @@ -default: maas -environments: - # https://juju.ubuntu.com/docs/config-maas.html - maas: - type: maas - - # maas-server specifies the location of the MAAS server. It must - # specify the base path. - # - maas-server: 'http://10.4.1.1/MAAS/' - - # maas-oauth holds the OAuth credentials from MAAS. - # - maas-oauth: 'c6tcQz4tyS3ALajCtF:sqcWhw8MkxTjUDLZrm:hBhszBLv5EqrY8h6yktFXWUT5825ShvE' - - # maas-server bootstrap ssh connection options - # - - # bootstrap-timeout time to wait contacting a state server, in seconds. - bootstrap-timeout: 1800 - admin-secret: admin - - # Whether or not to refresh the list of available updates for an - # OS. The default option of true is recommended for use in - # production systems, but disabling this can speed up local - # deployments for development or testing. - # - enable-os-refresh-update: false - - # Whether or not to perform OS upgrades when machines are - # provisioned. The default option of true is recommended for use - # in production systems, but disabling this can speed up local - # deployments for development or testing. - # - enable-os-upgrade: false - diff --git a/ci/intel/pod5/kilo/odl/ha/ovs-odl.yaml b/ci/intel/pod5/kilo/odl/ha/ovs-odl.yaml deleted file mode 100644 index 8da98659..00000000 --- a/ci/intel/pod5/kilo/odl/ha/ovs-odl.yaml +++ /dev/null @@ -1,101 +0,0 @@ -openstack-services: - series: trusty - services: - ubuntu: - branch: "lp:charms/trusty/ubuntu" - num_utils: 1 - constraints: tags=physical - neutron-gateway: - branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl - constraints: tags=neutron - options: - plugin: ovs-odl - instance-mtu: 1400 - nova-compute: - branch: lp:~openstack-charmers/charms/trusty/nova-compute/next - num_units: 2 - constraints: tags=physical - options: - enable-live-migration: False - manage-neutron-plugin-legacy-mode: False - neutron-api: - branch: lp:~openstack-charmers/charms/trusty/neutron-api/next - options: - neutron-security-groups: False - manage-neutron-plugin-legacy-mode: False - to: lxc:ubuntu=0 - neutron-api-odl: - branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp - options: - overlay-network-type: 'vxlan gre' - security-groups: true - odl-controller: - branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk - options: - install-url: "http://10.4.1.1/odl/distribution-karaf-0.2.4-Helium-SR4.tar.gz" - to: lxc:ubuntu=0 - openvswitch-odl: - charm: local:trusty/openvswitch-odl - mysql: - charm: cs:trusty/mysql - options: - dataset-size: 50% - max-connections: 20000 - to: lxc:ubuntu=0 - rabbitmq-server: - charm: cs:trusty/rabbitmq-server - to: lxc:ubuntu=0 - keystone: - charm: cs:trusty/keystone - options: - admin-password: openstack - admin-token: admin - to: lxc:ubuntu=0 - openstack-dashboard: - charm: cs:trusty/openstack-dashboard - to: lxc:ubuntu=0 - nova-cloud-controller: - charm: cs:trusty/nova-cloud-controller - options: - network-manager: Neutron - quantum-security-groups: "yes" - to: lxc:ubuntu=0 - glance: - charm: cs:trusty/glance - to: lxc:ubuntu=0 - relations: - - ['neutron-api:neutron-plugin-api-subordinate', 'neutron-api-odl:neutron-plugin-api-subordinate'] - - ['nova-compute:neutron-plugin', 'openvswitch-odl:neutron-plugin'] - - ['neutron-gateway', 'openvswitch-odl'] - - ['openvswitch-odl:ovsdb-manager', 'odl-controller:ovsdb-manager'] - - ['neutron-api-odl:odl-controller', 'odl-controller:controller-api'] - - ['keystone:shared-db', 'mysql:shared-db'] - - ['nova-cloud-controller:shared-db', 'mysql:shared-db'] - - ['nova-cloud-controller:amqp', 'rabbitmq-server:amqp'] - - ['nova-cloud-controller:image-service', 'glance:image-service'] - - ['nova-cloud-controller:identity-service', 'keystone:identity-service'] - - ['nova-compute:cloud-compute', 'nova-cloud-controller:cloud-compute'] - - ['nova-compute:amqp', 'rabbitmq-server:amqp'] - - ['nova-compute:image-service', 'glance:image-service'] - - ['glance:shared-db', 'mysql:shared-db'] - - ['glance:identity-service', 'keystone:identity-service'] - - ['glance:amqp', 'rabbitmq-server:amqp'] - - ['neutron-api:shared-db', 'mysql:shared-db'] - - ['neutron-api:amqp', 'rabbitmq-server:amqp'] - - ['neutron-api:neutron-api', 'nova-cloud-controller:neutron-api'] - - ['neutron-api:identity-service', 'keystone:identity-service'] - - ['neutron-gateway:amqp', 'rabbitmq-server:amqp'] - - ['neutron-gateway:neutron-plugin-api', 'neutron-api:neutron-plugin-api'] - - ['neutron-gateway:quantum-network-service', 'nova-cloud-controller:quantum-network-service'] - - ['openstack-dashboard:identity-service','keystone:identity-service'] -trusty-kilo: - inherits: openstack-services - overrides: - openstack-origin: cloud:trusty-kilo -trusty-juno: - inherits: openstack-services - overrides: - openstack-origin: cloud:trusty-juno -trusty-icehouse: - inherits: openstack-services - diff --git a/ci/intel/pod5/kilo/odl/ovs-odl.yaml b/ci/intel/pod5/kilo/odl/ovs-odl.yaml deleted file mode 100644 index 8da98659..00000000 --- a/ci/intel/pod5/kilo/odl/ovs-odl.yaml +++ /dev/null @@ -1,101 +0,0 @@ -openstack-services: - series: trusty - services: - ubuntu: - branch: "lp:charms/trusty/ubuntu" - num_utils: 1 - constraints: tags=physical - neutron-gateway: - branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl - constraints: tags=neutron - options: - plugin: ovs-odl - instance-mtu: 1400 - nova-compute: - branch: lp:~openstack-charmers/charms/trusty/nova-compute/next - num_units: 2 - constraints: tags=physical - options: - enable-live-migration: False - manage-neutron-plugin-legacy-mode: False - neutron-api: - branch: lp:~openstack-charmers/charms/trusty/neutron-api/next - options: - neutron-security-groups: False - manage-neutron-plugin-legacy-mode: False - to: lxc:ubuntu=0 - neutron-api-odl: - branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp - options: - overlay-network-type: 'vxlan gre' - security-groups: true - odl-controller: - branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk - options: - install-url: "http://10.4.1.1/odl/distribution-karaf-0.2.4-Helium-SR4.tar.gz" - to: lxc:ubuntu=0 - openvswitch-odl: - charm: local:trusty/openvswitch-odl - mysql: - charm: cs:trusty/mysql - options: - dataset-size: 50% - max-connections: 20000 - to: lxc:ubuntu=0 - rabbitmq-server: - charm: cs:trusty/rabbitmq-server - to: lxc:ubuntu=0 - keystone: - charm: cs:trusty/keystone - options: - admin-password: openstack - admin-token: admin - to: lxc:ubuntu=0 - openstack-dashboard: - charm: cs:trusty/openstack-dashboard - to: lxc:ubuntu=0 - nova-cloud-controller: - charm: cs:trusty/nova-cloud-controller - options: - network-manager: Neutron - quantum-security-groups: "yes" - to: lxc:ubuntu=0 - glance: - charm: cs:trusty/glance - to: lxc:ubuntu=0 - relations: - - ['neutron-api:neutron-plugin-api-subordinate', 'neutron-api-odl:neutron-plugin-api-subordinate'] - - ['nova-compute:neutron-plugin', 'openvswitch-odl:neutron-plugin'] - - ['neutron-gateway', 'openvswitch-odl'] - - ['openvswitch-odl:ovsdb-manager', 'odl-controller:ovsdb-manager'] - - ['neutron-api-odl:odl-controller', 'odl-controller:controller-api'] - - ['keystone:shared-db', 'mysql:shared-db'] - - ['nova-cloud-controller:shared-db', 'mysql:shared-db'] - - ['nova-cloud-controller:amqp', 'rabbitmq-server:amqp'] - - ['nova-cloud-controller:image-service', 'glance:image-service'] - - ['nova-cloud-controller:identity-service', 'keystone:identity-service'] - - ['nova-compute:cloud-compute', 'nova-cloud-controller:cloud-compute'] - - ['nova-compute:amqp', 'rabbitmq-server:amqp'] - - ['nova-compute:image-service', 'glance:image-service'] - - ['glance:shared-db', 'mysql:shared-db'] - - ['glance:identity-service', 'keystone:identity-service'] - - ['glance:amqp', 'rabbitmq-server:amqp'] - - ['neutron-api:shared-db', 'mysql:shared-db'] - - ['neutron-api:amqp', 'rabbitmq-server:amqp'] - - ['neutron-api:neutron-api', 'nova-cloud-controller:neutron-api'] - - ['neutron-api:identity-service', 'keystone:identity-service'] - - ['neutron-gateway:amqp', 'rabbitmq-server:amqp'] - - ['neutron-gateway:neutron-plugin-api', 'neutron-api:neutron-plugin-api'] - - ['neutron-gateway:quantum-network-service', 'nova-cloud-controller:quantum-network-service'] - - ['openstack-dashboard:identity-service','keystone:identity-service'] -trusty-kilo: - inherits: openstack-services - overrides: - openstack-origin: cloud:trusty-kilo -trusty-juno: - inherits: openstack-services - overrides: - openstack-origin: cloud:trusty-juno -trusty-icehouse: - inherits: openstack-services - |