diff options
| -rwxr-xr-x | ci/02-maasdeploy.sh | 8 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml | 4 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml | 384 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml | 388 | ||||
| -rwxr-xr-x | ci/openstack.sh | 3 |
5 files changed, 334 insertions, 453 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index ce3208e8..d19f7d6a 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -12,10 +12,12 @@ sudo apt-add-repository ppa:maas/stable -y sudo apt-add-repository cloud-archive:mitaka -y sudo apt-get update -y sudo apt-get dist-upgrade -y -sudo apt-get install openssh-server git maas-deployer juju juju-deployer maas-cli python-pip python-openstackclient python-congressclient gsutil -y +sudo apt-get install openssh-server bzr git maas-deployer juju juju-deployer \ + maas-cli python-pip python-psutil python-openstackclient \ + python-congressclient gsutil -y -#first parameter should be custom and second should be either -# absolute location of file (including file name) or url of the +#first parameter should be custom and second should be either +# absolute location of file (including file name) or url of the # file to download. if [ "$1" == "custom" ]; then diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml index 1849f27b..3db4270e 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml @@ -3,7 +3,7 @@ trusty-mitaka-nodes: inherits: openstack-phase1 trusty-mitaka: - inherits: openstack-phase2 + inherits: contrail overrides: #os-data-network: 10.4.8.0/21 #ceph-cluster-network: 10.4.0.0/21 @@ -20,7 +20,6 @@ trusty-mitaka: openstack-phase1: services: nodes: - nodes: charm: "cs:trusty/ubuntu" num_units: 5 ntp: @@ -384,4 +383,3 @@ openstack-phase2: #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 index 8b19ee3a..504e1303 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml @@ -1,65 +1,173 @@ # 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: - series: trusty services: - nodes-api: - charm: "cs:trusty/ubuntu" - num_units: 1 - constraints: tags=control - nodes-compute: + nodes: charm: "cs:trusty/ubuntu" num_units: 2 - constraints: tags=compute ntp: - charm: "cs:trusty/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: - branch: lp:~charmers/charms/precise/zookeeper/trunk + charm: local:precise/zookeeper series: precise to: - - "lxc:nodes-api=0" + - "lxc:nodes=0" cassandra: - branch: lp:~stub/charms/trusty/cassandra/noauthentication + charm: local:trusty/cassandra to: - - "lxc:nodes-api=0" + - "lxc:nodes=1" options: authenticator: AllowAllAuthenticator relations: - - "ntp:juju-info" - - "nodes-api:juju-info" + - "nodes:juju-info" - - "ntp:juju-info" - - "nodes-compute: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: lcoal: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: - branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" - num_units: 1 + charm: "local:trusty/percona-cluster" options: dataset-size: 2G max-connections: 10000 to: - - "lxc:nodes-api=0" + - "lxc:nodes=0" mongodb: - charm: "cs:trusty/mongodb" - num_units: 1 + charm: local:trusty/mongodb to: - - "lxc:nodes-api=0" + - "lxc:nodes=1" ceilometer: - branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next" - num_units: 1 + charm: "local:trusty/ceilometer" to: - - "lxc:nodes-api=0" + - "lxc:nodes=0" ceilometer-agent: - branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" + charm: "local:trusty/ceilometer-agent" heat: - branch: "lp:~openstack-charmers/charms/trusty/heat/next" + charm: "local:trusty/heat" to: - - "lxc:nodes-api=0" + - "lxc:nodes=1" ceph: - branch: "lp:~openstack-charmers/charms/trusty/ceph/next" + charm: "local:trusty/ceph" num_units: 2 options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 @@ -70,249 +178,81 @@ openstack-phase2: # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: - - "lxc:nodes-api=0" - - "lxc:nodes-api=0" + - "lxc:nodes=0" + - "lxc:nodes=1" ceph-osd: - branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next" + charm: "local:trusty/ceph-osd" num_units: 2 options: osd-devices: /srv osd-reformat: 'yes' to: - - "nodes-compute=0" - - "nodes-compute=1" + - "nodes=0" + - "nodes=1" ceph-radosgw: - branch: lp:~openstack-charmers/charms/trusty/ceph-radosgw/next - num_units: 1 + charm: local:trusty/ceph-radosgw options: use-embedded-webserver: true operator-roles: "Member,admin" to: - - "lxc:nodes-api=0" + - "lxc:nodes=0" cinder: - branch: lp:~openstack-charmers/charms/trusty/cinder/next - num_units: 1 + charm: local:trusty/cinder options: block-device: None glance-api-version: 2 # ha-mcastport: 5401 to: - - "lxc:nodes-api=0" + - "lxc:nodes=1" cinder-ceph: - branch: lp:~openstack-charmers/charms/trusty/cinder-ceph/next + charm: local:trusty/cinder-ceph rabbitmq-server: - branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next - num_units: 1 + charm: local:trusty/rabbitmq-server to: - - "lxc:nodes-api=0" + - "lxc:nodes=0" keystone: - branch: lp:~openstack-charmers/charms/trusty/keystone/next - num_units: 1 + charm: local:trusty/keystone options: admin-password: openstack admin-token: admin to: - - "lxc:nodes-api=0" + - "lxc:nodes=1" openstack-dashboard: - branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next - num_units: 1 + charm: local:trusty/openstack-dashboard options: secret: admin webroot: / to: - - "lxc:nodes-api=0" + - "lxc:nodes=0" nova-compute: - branch: lp:~openstack-charmers/charms/trusty/nova-compute/next - num_units: 1 + charm: local:trusty/nova-compute options: manage-neutron-plugin-legacy-mode: False to: - - "nodes-compute=0" -# - "nodes-compute=1" + - "nodes=1" nova-cloud-controller: - branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next - num_units: 1 + charm: local:trusty/nova-cloud-controller options: network-manager: Neutron to: - - "lxc:nodes-api=0" + - "lxc:nodes=1" neutron-api: - branch: lp:~opnfv-team/charms/trusty/neutron-api/next - num_units: 1 + charm: local:trusty/neutron-api options: manage-neutron-plugin-legacy-mode: False to: - - "lxc:nodes-api=0" + - "lxc:nodes=0" glance: - branch: lp:~openstack-charmers/charms/trusty/glance/next - num_units: 1 + charm: local:trusty/glance to: - - "lxc:nodes-api=0" + - "lxc:nodes=1" opnfv-promise: - branch: lp:~narindergupta/charms/trusty/promise/trunk - num_units: 1 + charm: local:trusty/promise to: - - "lxc:nodes-api=0" + - "lxc:nodes=0" congress: charm: local:trusty/congress options: #source-branch: stable/mitaka to: - - "lxc:nodes-api=0" - 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"] - - - congress:shared-db - - mysql:shared-db - - - congress:identity-service - - keystone:identity-service - - - congress:amqp - - rabbitmq-server:amqp -contrail: - inherits: openstack-phase2 - services: - contrail-configuration: - branch: lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk - to: - - "lxc:nodes-api=0" - contrail-control: - branch: lp:~sdn-charmers/charms/trusty/contrail-control/trunk - to: - - "lxc:nodes-api=0" - contrail-analytics: - branch: lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk - to: - - "lxc:nodes-api=0" - contrail-webui: - branch: lp:~sdn-charmers/charms/trusty/contrail-webui/trunk - to: - - "lxc:nodes-api=0" - neutron-api-contrail: - branch: lp:~opnfv-team/charms/trusty/neutron-api-contrail/trunk - neutron-contrail: - branch: lp:~opnfv-team/charms/trusty/neutron-contrail/trunk - 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 ] - - -trusty-liberty-nodes: - inherits: openstack-phase1 - series: trusty - overrides: - series: trusty - -trusty-liberty: - inherits: contrail - series: trusty - overrides: - series: trusty - #os-data-network: 10.4.8.0/21 - #ceph-cluster-network: 10.4.0.0/21 - #prefer-ipv6: true - region: Canonical - openstack-origin: cloud:trusty-liberty - source: "cloud:trusty-liberty" - ceph-osd-replication-count: 2 - admin-role: admin - keystone-admin-role: admin - -trusty-kilo-nodes: - inherits: openstack-phase1 - series: trusty - overrides: - series: trusty - -trusty-kilo: - inherits: contrail - series: trusty - overrides: - series: trusty - #os-data-network: 10.4.8.0/21 - #ceph-cluster-network: 10.4.0.0/21 - #prefer-ipv6: true - region: Canonical - openstack-origin: cloud:trusty-kilo - source: "cloud:trusty-kilo" - ceph-osd-replication-count: 2 - admin-role: admin - keystone-admin-role: admin - -trusty-juno-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-juno: - inherits: contrail - series: trusty - overrides: - series: trusty - #os-data-network: 10.4.8.0/21 - #ceph-cluster-network: 10.4.0.0/21 - #prefer-ipv6: true - region: Canonical - openstack-origin: cloud:trusty-juno - source: "cloud:trusty-juno" - ceph-osd-replication-count: 2 - admin-role: admin - keystone-admin-role: admin - + - "lxc:nodes=1" diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml index 473eb35a..1a5fda41 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml @@ -1,65 +1,174 @@ # 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: - series: trusty services: - nodes-api: - charm: "cs:trusty/ubuntu" - num_units: 1 - constraints: tags=control - nodes-compute: + nodes: charm: "cs:trusty/ubuntu" num_units: 2 - constraints: tags=compute ntp: - charm: "cs:trusty/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: - branch: lp:~charmers/charms/precise/zookeeper/trunk + charm: local:precise/zookeeper series: precise to: - - "lxc:nodes-api=0" + - "lxc:nodes=0" cassandra: - branch: lp:~stub/charms/trusty/cassandra/noauthentication + charm: local:trusty/cassandra to: - - "lxc:nodes-api=0" + - "lxc:nodes=1" options: authenticator: AllowAllAuthenticator relations: - - "ntp:juju-info" - - "nodes-api:juju-info" + - "nodes:juju-info" - - "ntp:juju-info" - - "nodes-compute: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: lcoal: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: - branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" - num_units: 1 + charm: "local:trusty/percona-cluster" options: dataset-size: 2G max-connections: 10000 to: - - "lxc:nodes-api=0" + - "lxc:nodes=0" mongodb: - charm: "cs:trusty/mongodb" - num_units: 1 + charm: local:trusty/mongodb to: - - "lxc:nodes-api=0" + - "lxc:nodes=1" ceilometer: - branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next" - num_units: 1 + charm: "local:trusty/ceilometer" to: - - "lxc:nodes-api=0" + - "lxc:nodes=0" ceilometer-agent: - branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" + charm: "local:trusty/ceilometer-agent" heat: - branch: "lp:~openstack-charmers/charms/trusty/heat/next" + charm: "local:trusty/heat" to: - - "lxc:nodes-api=0" + - "lxc:nodes=1" ceph: - branch: "lp:~openstack-charmers/charms/trusty/ceph/next" + charm: "local:trusty/ceph" num_units: 2 options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 @@ -70,252 +179,81 @@ openstack-phase2: # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: - - "lxc:nodes-api=0" - - "lxc:nodes-api=0" + - "lxc:nodes=0" + - "lxc:nodes=1" ceph-osd: - branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next" + charm: "local:trusty/ceph-osd" num_units: 2 options: osd-devices: /srv osd-reformat: 'yes' to: - - "nodes-compute=0" - - "nodes-compute=1" + - "nodes=0" + - "nodes=1" ceph-radosgw: - branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next" - num_units: 1 + charm: local:trusty/ceph-radosgw options: use-embedded-webserver: true operator-roles: "Member,admin" to: - - "lxc:nodes-api=0" + - "lxc:nodes=0" cinder: - branch: "lp:~openstack-charmers/charms/trusty/cinder/next" - num_units: 1 + charm: local:trusty/cinder options: block-device: None glance-api-version: 2 # ha-mcastport: 5401 to: - - "lxc:nodes-api=0" + - "lxc:nodes=1" cinder-ceph: - branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next" + charm: local:trusty/cinder-ceph rabbitmq-server: - branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next - num_units: 1 + charm: local:trusty/rabbitmq-server to: - - "lxc:nodes-api=0" + - "lxc:nodes=0" keystone: - branch: lp:~openstack-charmers/charms/trusty/keystone/next - num_units: 1 + charm: local:trusty/keystone options: - openstack-origin-git: include-file://keystone-master.yaml admin-password: openstack admin-token: admin to: - - "lxc:nodes-api=0" + - "lxc:nodes=1" openstack-dashboard: - branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next - num_units: 1 + charm: local:trusty/openstack-dashboard options: - openstack-origin-git: include-file://horizon-master.yaml secret: admin webroot: / to: - - "lxc:nodes-api=0" + - "lxc:nodes=0" nova-compute: - branch: lp:~openstack-charmers/charms/trusty/nova-compute/next - num_units: 1 + charm: local:trusty/nova-compute options: - openstack-origin-git: include-file://nova-master.yaml manage-neutron-plugin-legacy-mode: False to: - - "nodes-compute=0" -# - "nodes-compute=1" + - "nodes=1" nova-cloud-controller: - branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next - num_units: 1 + charm: local:trusty/nova-cloud-controller options: - openstack-origin-git: include-file://nova-master.yaml network-manager: Neutron to: - - "lxc:nodes-api=0" + - "lxc:nodes=1" neutron-api: - branch: lp:~opnfv-team/charms/trusty/neutron-api/next - num_units: 1 + charm: local:trusty/neutron-api options: manage-neutron-plugin-legacy-mode: False to: - - "lxc:nodes-api=0" + - "lxc:nodes=0" glance: - branch: lp:~openstack-charmers/charms/trusty/glance/next - num_units: 1 - options: - openstack-origin-git: include-file://glance-master.yaml + charm: local:trusty/glance to: - - "lxc:nodes-api=0" + - "lxc:nodes=1" opnfv-promise: - branch: lp:~narindergupta/charms/trusty/promise/trunk - num_units: 1 + charm: local:trusty/promise to: - - "lxc:nodes-api=0" + - "lxc:nodes=0" congress: charm: local:trusty/congress options: #source-branch: stable/mitaka to: - - "lxc:nodes-api=0" - 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" ] - - - congress:shared-db - - mysql:shared-db - - - congress:identity-service - - keystone:identity-service - - - congress:amqp - - rabbitmq-server:amqp -contrail: - inherits: openstack-phase2 - services: - contrail-configuration: - branch: lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk - to: - - "lxc:nodes-api=0" - contrail-control: - branch: lp:~sdn-charmers/charms/trusty/contrail-control/trunk - to: - - "lxc:nodes-api=0" - contrail-analytics: - branch: lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk - to: - - "lxc:nodes-api=0" - contrail-webui: - branch: lp:~sdn-charmers/charms/trusty/contrail-webui/trunk - to: - - "lxc:nodes-api=0" - neutron-api-contrail: - branch: lp:~opnfv-team/charms/trusty/neutron-api-contrail/trunk - neutron-contrail: - branch: lp:~opnfv-team/charms/trusty/neutron-contrail/trunk - 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 ] - - [ "ceph-osd:mon", "ceph:osd" ] - - [ "ceph-radosgw:mon", "ceph:radosgw" ] - - [ "ceph-radosgw:identity-service", "keystone:identity-service" ] - -trusty-liberty-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-liberty: - inherits: contrail - series: trusty - overrides: - series: trusty - #os-data-network: 10.4.8.0/21 - #ceph-cluster-network: 10.4.0.0/21 - #prefer-ipv6: true - region: Canonical - openstack-origin: cloud:trusty-liberty - source: "cloud:trusty-liberty" - ceph-osd-replication-count: 2 - admin-role: admin - keystone-admin-role: admin - -trusty-kilo-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-kilo: - inherits: contrail - series: trusty - overrides: - series: trusty - #os-data-network: 10.4.8.0/21 - #ceph-cluster-network: 10.4.0.0/21 - #prefer-ipv6: true - region: Canonical - openstack-origin: cloud:trusty-kilo - source: "cloud:trusty-kilo" - ceph-osd-replication-count: 2 - admin-role: admin - keystone-admin-role: admin - -trusty-juno-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-juno: - inherits: contrail - series: trusty - overrides: - series: trusty - #os-data-network: 10.4.8.0/21 - #ceph-cluster-network: 10.4.0.0/21 - #prefer-ipv6: true - region: Canonical - openstack-origin: cloud:trusty-juno - source: "cloud:trusty-juno" - ceph-osd-replication-count: 2 - admin-role: admin - keystone-admin-role: admin - + - "lxc:nodes=1" diff --git a/ci/openstack.sh b/ci/openstack.sh index 310cb8a3..1b36aabe 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -80,6 +80,9 @@ openstack image create --file /tmp/images/cirros-0.3.3-x86_64-disk.img --disk-fo #wget -P /tmp/images http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img #openstack image create --file /tmp/images/trusty-server-cloudimg-amd64-disk1.img --disk-format qcow2 --container-format bare "ubuntu-trusty-daily" +#wget -P /tmp/images http://cloud-images.ubuntu.com/trusty/current/xenial-server-cloudimg-amd64.tar.gz +#openstack image create --file /tmp/images/xenial-server-cloudimg-amd64.tar.gz --container-format bare --disk-format raw "xenial-server-cloudimg-amd64" + rm -rf /tmp/images # adjust tiny image |