diff options
Diffstat (limited to 'ci/opencontrail/juju-deployer')
| l--------- | ci/opencontrail/juju-deployer/ovs-ocl-ha.yaml | 1 | ||||
| l--------- | ci/opencontrail/juju-deployer/ovs-ocl-nonha.yaml | 1 | ||||
| l--------- | ci/opencontrail/juju-deployer/ovs-ocl-tip.yaml | 1 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml | 392 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml | 256 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml | 258 | ||||
| -rwxr-xr-x | ci/opencontrail/juju-deployer/scripts/cloud-setup.sh | 33 | ||||
| -rwxr-xr-x | ci/opencontrail/juju-deployer/scripts/glance.sh | 8 | ||||
| -rwxr-xr-x | ci/opencontrail/juju-deployer/scripts/openstack.sh | 48 |
9 files changed, 0 insertions, 998 deletions
diff --git a/ci/opencontrail/juju-deployer/ovs-ocl-ha.yaml b/ci/opencontrail/juju-deployer/ovs-ocl-ha.yaml deleted file mode 120000 index 819993bd..00000000 --- a/ci/opencontrail/juju-deployer/ovs-ocl-ha.yaml +++ /dev/null @@ -1 +0,0 @@ -ovs-opencontrail-ha.yaml
\ No newline at end of file diff --git a/ci/opencontrail/juju-deployer/ovs-ocl-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-ocl-nonha.yaml deleted file mode 120000 index dc2ea145..00000000 --- a/ci/opencontrail/juju-deployer/ovs-ocl-nonha.yaml +++ /dev/null @@ -1 +0,0 @@ -ovs-opencontrail-nonha.yaml
\ No newline at end of file diff --git a/ci/opencontrail/juju-deployer/ovs-ocl-tip.yaml b/ci/opencontrail/juju-deployer/ovs-ocl-tip.yaml deleted file mode 120000 index 509bf6cc..00000000 --- a/ci/opencontrail/juju-deployer/ovs-ocl-tip.yaml +++ /dev/null @@ -1 +0,0 @@ -ovs-opencontrail-tip.yaml
\ No newline at end of file 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" diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml deleted file mode 100644 index 176e59a1..00000000 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml +++ /dev/null @@ -1,256 +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: 2 - 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 - series: precise - to: - - "lxc:nodes=0" - cassandra: - charm: local:trusty/cassandra - to: - - "lxc:nodes=1" - 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 ] - services: - contrail-configuration: - charm: local:trusty/contrail-configuration - to: - - "lxc:nodes=0" - contrail-control: - charm: local:trusty/contrail-control - to: - - "lxc:nodes=1" - contrail-analytics: - charm: local:trusty/contrail-analytics - to: - - "lxc:nodes=0" - contrail-webui: - charm: local:trusty/contrail-webui - to: - - "lxc:nodes=1" - neutron-api-contrail: - charm: local:trusty/neutron-api-contrail - neutron-contrail: - charm: local:trusty/neutron-contrail - -openstack-phase2: - inherits: openstack-phase1 - relations: - - [ 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" - options: - dataset-size: 2G - max-connections: 10000 - to: - - "lxc:nodes=0" - mongodb: - charm: local:trusty/mongodb - to: - - "lxc:nodes=1" - ceilometer: - charm: "local:trusty/ceilometer" - to: - - "lxc:nodes=0" - ceilometer-agent: - charm: "local:trusty/ceilometer-agent" - heat: - charm: "local:trusty/heat" - to: - - "lxc:nodes=1" - ceph: - charm: "local:trusty/ceph" - num_units: 2 - options: - fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 - monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - monitor-count: 2 -# osd-reformat: 'no' -# ceph-cluster-network: 192.168.0.0/24 -# ceph-public-network: 192.168.0.0/24 - to: - - "lxc:nodes=0" - - "lxc:nodes=1" - ceph-osd: - charm: "local:trusty/ceph-osd" - num_units: 2 - options: - osd-devices: /srv - osd-reformat: 'yes' - to: - - "nodes=0" - - "nodes=1" - 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 - options: - block-device: None - glance-api-version: 2 - to: - - "lxc:nodes=1" - cinder-ceph: - charm: local:trusty/cinder-ceph - rabbitmq-server: - charm: local:trusty/rabbitmq-server - to: - - "lxc:nodes=0" - keystone: - charm: local:trusty/keystone - options: - admin-password: openstack - admin-token: admin - to: - - "lxc:nodes=1" - openstack-dashboard: - charm: local:trusty/openstack-dashboard - options: - secret: admin - webroot: / - to: - - "lxc:nodes=0" - nova-compute: - charm: local:trusty/nova-compute - options: - manage-neutron-plugin-legacy-mode: False - to: - - "nodes=1" - nova-cloud-controller: - charm: local:trusty/nova-cloud-controller - options: - network-manager: Neutron - to: - - "lxc:nodes=1" - neutron-api: - charm: local:trusty/neutron-api - options: - manage-neutron-plugin-legacy-mode: False - to: - - "lxc:nodes=0" - glance: - charm: local:trusty/glance - to: - - "lxc:nodes=1" - opnfv-promise: - charm: local:trusty/promise - to: - - "lxc:nodes=0" - congress: - charm: local:trusty/congress - options: - #source-branch: stable/mitaka - to: - - "lxc:nodes=1" diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml deleted file mode 100644 index a19d84a3..00000000 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml +++ /dev/null @@ -1,258 +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-origin-git: mitaka - -openstack-phase1: - services: - nodes: - charm: "cs:trusty/ubuntu" - num_units: 2 - 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 - series: precise - to: - - "lxc:nodes=0" - cassandra: - charm: local:trusty/cassandra - to: - - "lxc:nodes=1" - 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 ] - services: - contrail-configuration: - charm: local:trusty/contrail-configuration - to: - - "lxc:nodes=0" - contrail-control: - charm: local:trusty/contrail-control - to: - - "lxc:nodes=1" - contrail-analytics: - charm: local:trusty/contrail-analytics - to: - - "lxc:nodes=0" - contrail-webui: - charm: local:trusty/contrail-webui - to: - - "lxc:nodes=1" - neutron-api-contrail: - charm: local:trusty/neutron-api-contrail - neutron-contrail: - charm: local:trusty/neutron-contrail - -openstack-phase2: - inherits: openstack-phase1 - relations: - - [ 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" - options: - dataset-size: 2G - max-connections: 10000 - to: - - "lxc:nodes=0" - mongodb: - charm: local:trusty/mongodb - to: - - "lxc:nodes=1" - ceilometer: - charm: "local:trusty/ceilometer" - to: - - "lxc:nodes=0" - ceilometer-agent: - charm: "local:trusty/ceilometer-agent" - heat: - charm: "local:trusty/heat" - to: - - "lxc:nodes=1" - ceph: - charm: "local:trusty/ceph" - num_units: 2 - options: - fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 - monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: "" - monitor-count: 1 -# osd-reformat: 'no' -# ceph-cluster-network: 192.168.0.0/24 -# ceph-public-network: 192.168.0.0/24 - to: - - "lxc:nodes=0" - - "lxc:nodes=1" - ceph-osd: - charm: "local:trusty/ceph-osd" - num_units: 2 - options: - osd-devices: /srv - osd-reformat: 'yes' - to: - - "nodes=0" - - "nodes=1" - 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 - options: - block-device: None - glance-api-version: 2 - to: - - "lxc:nodes=1" - cinder-ceph: - charm: local:trusty/cinder-ceph - rabbitmq-server: - charm: local:trusty/rabbitmq-server - to: - - "lxc:nodes=0" - keystone: - charm: local:trusty/keystone - options: - admin-password: openstack - admin-token: admin - to: - - "lxc:nodes=1" - openstack-dashboard: - charm: local:trusty/openstack-dashboard - options: - secret: admin - webroot: / - to: - - "lxc:nodes=0" - nova-compute: - charm: local:trusty/nova-compute - options: - manage-neutron-plugin-legacy-mode: False - to: - - "nodes=1" - nova-cloud-controller: - charm: local:trusty/nova-cloud-controller - options: - network-manager: Neutron - to: - - "lxc:nodes=1" - neutron-api: - charm: local:trusty/neutron-api - options: - manage-neutron-plugin-legacy-mode: False - to: - - "lxc:nodes=0" - glance: - charm: local:trusty/glance - to: - - "lxc:nodes=1" - opnfv-promise: - charm: local:trusty/promise - to: - - "lxc:nodes=0" - congress: - charm: local:trusty/congress - options: - #source-branch: stable/mitaka - to: - - "lxc:nodes=1" diff --git a/ci/opencontrail/juju-deployer/scripts/cloud-setup.sh b/ci/opencontrail/juju-deployer/scripts/cloud-setup.sh deleted file mode 100755 index fab347cf..00000000 --- a/ci/opencontrail/juju-deployer/scripts/cloud-setup.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -e - -. ~/admin-openrc - -# adjust tiny image -nova flavor-delete m1.tiny -nova flavor-create m1.tiny 1 512 8 1 - -# configure external network -neutron net-create --router:external=True public-net -neutron subnet-create --name public-subnet --no-gateway --allocation-pool start=10.0.10.2,end=10.0.10.254 --disable-dhcp public-net 10.0.10.0/24 - -# create vm network -neutron net-create ubuntu-net -neutron subnet-create --name ubuntu-subnet --gateway 10.0.5.1 ubuntu-net 10.0.5.0/24 - -# create pool of floating ips -i=0 -while [ $i -ne 10 ]; do - neutron floatingip-create public-net - i=$((i + 1)) -done - -# configure security groups -neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol icmp --remote-ip-prefix 0.0.0.0/0 default -neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol tcp --port-range-min 22 --port-range-max 22 --remote-ip-prefix 0.0.0.0/0 default - -# import key pair -nova keypair-add --pub-key id_rsa.pub ubuntu-keypair - -#http://docs.openstack.org/juno/install-guide/install/apt/content/launch-instance-neutron.html -# nova boot --flavor m1.small --image cirros-0.3.3-x86_64 --nic net-id=b65479a4-3638-4595-9245-6e41ccd8bfd8 --security-group default --key-name ubuntu-keypair demo-instance1 -# nova floating-ip-associate demo-instance1 10.5.8.35 diff --git a/ci/opencontrail/juju-deployer/scripts/glance.sh b/ci/opencontrail/juju-deployer/scripts/glance.sh deleted file mode 100755 index 467932ff..00000000 --- a/ci/opencontrail/juju-deployer/scripts/glance.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -e - -. ~/admin-openrc - -wget http://cloud-images.ubuntu.com/trusty/current/MD5SUMS - -wget http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img -glance image-create --name ubuntu-trusty-daily --disk-format qcow2 --container-format bare --owner admin --file trusty-server-cloudimg-amd64-disk1.img --checksum $(grep trusty-server-cloudimg-amd64-disk1.img MD5SUMS | cut -d " " -f 1) --is-public True diff --git a/ci/opencontrail/juju-deployer/scripts/openstack.sh b/ci/opencontrail/juju-deployer/scripts/openstack.sh deleted file mode 100755 index 8926a935..00000000 --- a/ci/opencontrail/juju-deployer/scripts/openstack.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -ex - -configOpenrc() -{ - cat <<-EOF - export OS_USERNAME=$1 - export OS_PASSWORD=$2 - export OS_TENANT_NAME=$3 - export OS_AUTH_URL=$4 - export OS_REGION_NAME=$5 - EOF -} - -unitAddress() -{ - juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null -} - -unitMachine() -{ - juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null -} - -mkdir -m 0700 -p cloud -controller_address=$(unitAddress keystone 0) -configOpenrc admin openstck admin http://$controller_address:5000/v2.0 RegionOne > cloud/admin-openrc -chmod 0600 cloud/admin-openrc - -machine=$(unitMachine nova-cloud-controller 0) -juju scp cloud-setup.sh cloud/admin-openrc ~/.ssh/id_rsa.pub $machine: -juju run --machine $machine ./cloud-setup.sh - -# setup contrail routing -juju set contrail-configuration "floating-ip-pools=[ { project: admin, network: public-net, pool-name: floatingip_pool, target-projects: [ admin ] } ]" -juju set neutron-contrail "virtual-gateways=[ { project: admin, network: public-net, interface: vgw, subnets: [ 10.0.10.0/24 ], routes: [ 0.0.0.0/0 ] } ]" - -machine=$(unitMachine glance 0) -juju scp glance.sh cloud/admin-openrc $machine: -juju run --machine $machine ./glance.sh - -# setup host routing -if [ -n "$CONFIGURE_HOST_ROUTING" ]; then - compute_address=$(dig +short $(unitAddress nova-compute 0) | tail -n 1) - sudo ip route replace 10.0.10.0/24 via $compute_address - sudo iptables -C FORWARD -s 10.0.10.0/24 -j ACCEPT 2> /dev/null || sudo iptables -I FORWARD 1 -s 10.0.10.0/24 -j ACCEPT - sudo iptables -C FORWARD -d 10.0.10.0/24 -j ACCEPT 2> /dev/null || sudo iptables -I FORWARD 2 -d 10.0.10.0/24 -j ACCEPT - sudo iptables -t nat -C POSTROUTING -s 10.0.10.0/24 ! -d 10.0.10.0/24 -j MASQUERADE 2> /dev/null || sudo iptables -t nat -A POSTROUTING -s 10.0.10.0/24 ! -d 10.0.10.0/24 -j MASQUERADE -fi |