diff options
Diffstat (limited to 'ci/config_tpl/juju2')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/bundle.yaml | 8 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/ceph.yaml | 4 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/haclusters.yaml | 4 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/harelations.yaml | 6 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml | 151 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/phase2-overrides.yaml | 41 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/relations.yaml | 65 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/subordinate.yaml | 22 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml | 7 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml | 6 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml | 8 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/flannel.yaml | 7 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml | 20 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml | 9 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/relations.yaml | 5 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundlek8_tpl/subordinate.yaml | 4 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/deployconfig.yaml | 4 |
17 files changed, 196 insertions, 175 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml index 5a49b9a7..910d6073 100644 --- a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml @@ -13,7 +13,7 @@ {% else %} num_units: 1 {% endif %} - constraints: tags=control + nodes-compute: charm: "cs:{{ ubuntu.release }}/ubuntu" {% if os.ha.mode == 'ha' %} @@ -30,7 +30,6 @@ auto_peers: false {% endif %} {% include 'mysql.yaml' %} -{% include 'ceilometer.yaml' %} {% if opnfv.storage_dict.scaleio is defined %} {% include 'scaleio.yaml' %} {% else %} @@ -54,9 +53,12 @@ {% include 'nova-compute.yaml' %} {% include 'openstack-dashboard.yaml' %} {% include 'rabbitmq.yaml' %} -{% include 'heat.yaml' %} {% include 'neutron-api.yaml' %} +{% if os.network.controller != 'ocl' %} {% include 'neutron-gateway.yaml' %} +{% include 'heat.yaml' %} +{% include 'ceilometer.yaml' %} +{% endif %} {% include 'aodh.yaml' %} {% if os.network.controller == 'odl' %} {% include 'odl.yaml' %} diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml index dc4e101b..6b20d986 100644 --- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml @@ -39,8 +39,8 @@ {% endfor %} {% else %} - "lxd:nodes/0" - - "lxd:nodes/0" - - "lxd:nodes/0" + - "lxd:nodes/1" + - "lxd:nodes/2" {% endif %} {% endif %} ceph-osd: diff --git a/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml b/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml index 1f1afb5a..3b5f1844 100644 --- a/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml @@ -15,6 +15,7 @@ {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} +{% if os.network.controller != 'ocl' %} # hacluster-heat: # charm: "./{{ ubuntu.release }}/hacluster" # options: @@ -23,6 +24,7 @@ {% if os.network.ipv6 %} # prefer-ipv6: {{ os.network.ipv6 }} {% endif %} +{% endif %} hacluster-horizon: charm: "./{{ ubuntu.release }}/hacluster" options: @@ -55,6 +57,7 @@ {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} +{% if os.network.controller != 'ocl' %} hacluster-ceilometer: charm: "./{{ ubuntu.release }}/hacluster" options: @@ -63,6 +66,7 @@ {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} +{% endif %} hacluster-mysql: charm: "./{{ ubuntu.release }}/hacluster" options: diff --git a/ci/config_tpl/juju2/bundle_tpl/harelations.yaml b/ci/config_tpl/juju2/bundle_tpl/harelations.yaml index d4c4c064..212516c5 100644 --- a/ci/config_tpl/juju2/bundle_tpl/harelations.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/harelations.yaml @@ -1,13 +1,15 @@ {% if os.ha.mode == 'ha' %} +{% if os.network.controller != 'ocl' %} +# - [ 'heat:ha', 'hacluster-heat:ha' ] + - [ 'ceilometer:ha', 'hacluster-ceilometer:ha' ] +{% endif %} - [ 'mysql:ha', 'hacluster-mysql:ha' ] - [ 'cinder:ha', 'hacluster-cinder:ha' ] -# - [ 'heat:ha', 'hacluster-heat: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' ] {% if os.beta.hacluster_ceph_radosgw %} - [ 'ceph-radosgw:ha', 'hacluster-ceph-radosgw:ha' ] {% endif %} diff --git a/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml b/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml index 28866fbe..588eeb2b 100644 --- a/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml @@ -1,76 +1,111 @@ - zookeeper: - charm: ./{{ ubuntu.release }}/zookeeper - num_units: {{ unit_qty() }} - series: {{ ubuntu.release }} - to: -{% for unit_id in to_select() %} - - "lxd:nodes/{{ unit_id }}" -{% endfor %} - cassandra: - charm: ./{{ ubuntu.release }}/cassandra - num_units: {{ unit_qty() }} - to: -{% for unit_id in to_select() %} - - "lxd:nodes/{{ unit_id }}" -{% endfor %} - options: - authenticator: AllowAllAuthenticator - contrail-configuration: - charm: ./{{ ubuntu.release }}/contrail-configuration - num_units: {{ unit_qty() }} + + contrail-openstack: + charm: ./{{ ubuntu.release }}/contrail-openstack options: - openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" - install-sources: ppa:opencontrail/trunk-20160812 -{% if os.ha.mode == 'ha' %} - vip: {{ opnfv.vip.contrailconfig }} -{% endif %} - to: -{% for unit_id in to_select() %} - - "lxd:nodes/{{ unit_id }}" -{% endfor %} - contrail-control: - charm: ./{{ ubuntu.release }}/contrail-control - num_units: {{ unit_qty() }} + install-keys: | + - | + -----BEGIN PGP PUBLIC KEY BLOCK----- + Version: GnuPG v1 + + mQENBFkIj2sBCADL2Kws0P+19LnEMuWmGDJFo5WjJ3nk6ubf8AKQiF/5MMyYP665 + s3nKviU4gO+NBjMGIRWfVDUdikG/mUhlIC2x17lrIVA1rrOj7IwL6CgLDOn5lQeu + SOL2XavLToJlG1TgkPOObmCjeg8wZxswUIIc9BVVdG2XKFlEEQ0ExyhDjq25JuOI + OaWsY0TrAfuLnimZ/cchBT8ThTcheko47jaKnHI0rlsqXKX6oeZ1vIAtMSPIAuc/ + G0Et8z+aXY7vpWRrJsdXvZECJCVhc58af3LwmcczC5WvwGbrTI2Q7mCiVoUUyRV/ + MBXYSPZFCiLZHBive5ZrpfWozoLDUL+dZCMrABEBAAG0LFN0dWFydCBNYWNraWUg + KE9QTkZWKSA8d3NtYWNraWVAanVuaXBlci5uZXQ+iQE4BBMBAgAiBQJZCI9rAhsD + BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRB8SBQaOveMpwTSB/0Y0Fr0xXA+ + fd2j6Xq8+LJF6aM1/GKz9u36QR4nD2J6J4I01/OeJnemco1yPgkm7zLMMmWfIyRV + 1WStkRiKxcWYXU4Fg+iCikbPG09z5FeIDWh643mYClLpg+jI+c8gsYSzqiuLw7NM + 4Qn/cKqSh1IunFWgRSKpPlGgFSn+3jWaRZs98Pq+Zqz+FbjWArrsyWMsFXuB7/vm + X2wz1IcHWO4kcjtMaeTizMIitAjmWl0cO9X4IBgQMwRxlelD4lAw+iyCLUTkqmOW + kncGgfOOyV0A5Cd2Ws2Hi7Ikz1RUI6OqyVtlC76cEIG+DnPmb0v1BH8CQ6bLOrOT + kETcdvBBZOMmuQENBFkIj2sBCACy4VoDFcy8ZyLuKOwQw/9LdGMFkbb3OJDsrPT0 + bz9CmYHSTRVAbJljlOa0Q/qzpPNk7jHslMBjewp5nSdK091/LBc9OJw9SDcnLWHM + Nxxes6IyVOqZe2Xa49S3FqMJsfYf3Q6i89L5WySr+bcfF0+CFe57cKFGX3l/pPE2 + dVwIsCUo1puEFrvSJqQiU22MtrL7g8XM83zJF5OU7u34+BR+Rc40MSJm7dsbn29m + QKlmkoV1KSG7va/WNoz1sfySmPgMjHx2b1f5GGt3du5RQESn1jDTHdNj+bqvrQ3r + uw6SbbuCsGzMJMD3LovfI62xNGYhda/GlHgYAyg0nDJ1aa3TABEBAAGJAR8EGAEC + AAkFAlkIj2sCGwwACgkQfEgUGjr3jKdeigf/QsBlCNOXcuXjU0gw6w6Q77XQcNzD + 4+Bw2igCmQOhAZSMLsRMMWzLiu35xthVcUOACyLfCSZWSLQh8x8jGpU29cMhLqlY + CMerpnFldqH+f3omORBENAFCO1C4ZGym+zLFSBQBZhf8U7y2eC/sSeCGMEOkKpbg + TX5psQXa8SnjWUrfg0aDgd4KVK+AGE3BTVaJmT//OrXy8e4AzspX8oNa15ntk/ll + WOsSJ4g1WHIk3mwPLjCwufbu4GErHBxyCfYlG1I3Vu8Ilp7dL3vpjcDRocJLoIyb + WUHA5RozR0o3GEI/IDS5TiVqMxqvdkayP1ySrjBbQxT3wOiTBxic5wI/zQ== + =5y7K + -----END PGP PUBLIC KEY BLOCK----- + + install-sources: | + - "deb http:65.122.57.42/repo /" + + contrail-agent: + charm: ./{{ ubuntu.release }}/contrail-agent options: - openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" - install-sources: ppa:opencontrail/trunk-20160812 - to: -{% for unit_id in to_select() %} - - "lxd:nodes/{{ unit_id }}" -{% endfor %} + install-keys: | + - | + -----BEGIN PGP PUBLIC KEY BLOCK----- + Version: GnuPG v1 + + mQENBFkIj2sBCADL2Kws0P+19LnEMuWmGDJFo5WjJ3nk6ubf8AKQiF/5MMyYP665 + s3nKviU4gO+NBjMGIRWfVDUdikG/mUhlIC2x17lrIVA1rrOj7IwL6CgLDOn5lQeu + SOL2XavLToJlG1TgkPOObmCjeg8wZxswUIIc9BVVdG2XKFlEEQ0ExyhDjq25JuOI + OaWsY0TrAfuLnimZ/cchBT8ThTcheko47jaKnHI0rlsqXKX6oeZ1vIAtMSPIAuc/ + G0Et8z+aXY7vpWRrJsdXvZECJCVhc58af3LwmcczC5WvwGbrTI2Q7mCiVoUUyRV/ + MBXYSPZFCiLZHBive5ZrpfWozoLDUL+dZCMrABEBAAG0LFN0dWFydCBNYWNraWUg + KE9QTkZWKSA8d3NtYWNraWVAanVuaXBlci5uZXQ+iQE4BBMBAgAiBQJZCI9rAhsD + BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRB8SBQaOveMpwTSB/0Y0Fr0xXA+ + fd2j6Xq8+LJF6aM1/GKz9u36QR4nD2J6J4I01/OeJnemco1yPgkm7zLMMmWfIyRV + 1WStkRiKxcWYXU4Fg+iCikbPG09z5FeIDWh643mYClLpg+jI+c8gsYSzqiuLw7NM + 4Qn/cKqSh1IunFWgRSKpPlGgFSn+3jWaRZs98Pq+Zqz+FbjWArrsyWMsFXuB7/vm + X2wz1IcHWO4kcjtMaeTizMIitAjmWl0cO9X4IBgQMwRxlelD4lAw+iyCLUTkqmOW + kncGgfOOyV0A5Cd2Ws2Hi7Ikz1RUI6OqyVtlC76cEIG+DnPmb0v1BH8CQ6bLOrOT + kETcdvBBZOMmuQENBFkIj2sBCACy4VoDFcy8ZyLuKOwQw/9LdGMFkbb3OJDsrPT0 + bz9CmYHSTRVAbJljlOa0Q/qzpPNk7jHslMBjewp5nSdK091/LBc9OJw9SDcnLWHM + Nxxes6IyVOqZe2Xa49S3FqMJsfYf3Q6i89L5WySr+bcfF0+CFe57cKFGX3l/pPE2 + dVwIsCUo1puEFrvSJqQiU22MtrL7g8XM83zJF5OU7u34+BR+Rc40MSJm7dsbn29m + QKlmkoV1KSG7va/WNoz1sfySmPgMjHx2b1f5GGt3du5RQESn1jDTHdNj+bqvrQ3r + uw6SbbuCsGzMJMD3LovfI62xNGYhda/GlHgYAyg0nDJ1aa3TABEBAAGJAR8EGAEC + AAkFAlkIj2sCGwwACgkQfEgUGjr3jKdeigf/QsBlCNOXcuXjU0gw6w6Q77XQcNzD + 4+Bw2igCmQOhAZSMLsRMMWzLiu35xthVcUOACyLfCSZWSLQh8x8jGpU29cMhLqlY + CMerpnFldqH+f3omORBENAFCO1C4ZGym+zLFSBQBZhf8U7y2eC/sSeCGMEOkKpbg + TX5psQXa8SnjWUrfg0aDgd4KVK+AGE3BTVaJmT//OrXy8e4AzspX8oNa15ntk/ll + WOsSJ4g1WHIk3mwPLjCwufbu4GErHBxyCfYlG1I3Vu8Ilp7dL3vpjcDRocJLoIyb + WUHA5RozR0o3GEI/IDS5TiVqMxqvdkayP1ySrjBbQxT3wOiTBxic5wI/zQ== + =5y7K + -----END PGP PUBLIC KEY BLOCK----- + + install-sources: | + - "deb http:65.122.57.42/repo /" + contrail-analytics: charm: ./{{ ubuntu.release }}/contrail-analytics num_units: {{ unit_qty() }} - options: - openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" - install-sources: ppa:opencontrail/trunk-20160812 to: {% for unit_id in to_select() %} - - "lxd:nodes/{{ unit_id }}" + - "nodes/{{ unit_id }}" {% endfor %} - contrail-webui: - charm: ./{{ ubuntu.release }}/contrail-webui + + contrail-analyticsdb: + charm: ./{{ ubuntu.release }}/contrail-analyticsdb num_units: {{ unit_qty() }} - options: - install-sources: ppa:opencontrail/trunk-20160812 to: {% for unit_id in to_select() %} - - "lxd:nodes/{{ unit_id }}" + - "nodes/{{ unit_id }}" {% endfor %} - haproxy: - charm: ./{{ ubuntu.release }}/haproxy + + contrail-controller: + charm: ./{{ ubuntu.release }}/contrail-controller num_units: {{ unit_qty() }} - options: - peering_mode: active-active to: {% for unit_id in to_select() %} - - "lxd:nodes/{{ unit_id }}" + - "nodes/{{ unit_id }}" {% endfor %} - kafka: - charm: ./{{ ubuntu.release }}/kafka - num_units: {{ unit_qty() }} + + contrail-keystone-auth: + charm: ./{{ ubuntu.release }}/contrail-keystone-auth + num_units: 1 + bindings: + "": internal-api to: -{% for unit_id in to_select() %} - - "lxd:nodes/{{ unit_id }}" -{% endfor %} + - "lxd:nodes/0" diff --git a/ci/config_tpl/juju2/bundle_tpl/phase2-overrides.yaml b/ci/config_tpl/juju2/bundle_tpl/phase2-overrides.yaml deleted file mode 100644 index a8dbd400..00000000 --- a/ci/config_tpl/juju2/bundle_tpl/phase2-overrides.yaml +++ /dev/null @@ -1,41 +0,0 @@ -{% if opnfv.spaces_dict.storage is defined %} - #ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }} -{% endif %} -{% if os.network.ipv6 %} - #prefer-ipv6: {{ os.network.ipv6 }} -{% endif %} -{% if os.ha.mode == 'ha' %} -{% if os.api.haproxy_timeout %} - #haproxy-server-timeout: {{ os.api.haproxy_timeout }} - #haproxy-client-timeout: {{ os.api.haproxy_timeout }} - #haproxy-queue-timeout: {{ os.api.haproxy_timeout }} - #haproxy-connect-timeout: {{ os.api.haproxy_timeout }} -{% endif %} -{% endif %} -{% if os.api.worker_multiplier %} - #worker-multiplier: {{ os.api.worker_multiplier }} -{% endif %} -{% if os.network.dvr %} - #enable-dvr: true -{% endif %} -{% if os.network.l2_population %} - #l2-population: true -{% endif %} -{% if ubuntu.release == 'trusty' %} - #source: "cloud:{{ ubuntu.release }}-{{ os.release }}" -{% endif %} -{% if ubuntu.release == 'xenial' %} -{% if os.release == 'newton' %} - #source: "cloud:{{ ubuntu.release }}-{{ os.release }}" -{% endif %} -{% endif %} -{% if os.ha.mode == 'nonha' %} -{% if opnfv.storage_dict.ceph is defined %} - #ceph-osd-replication-count: {{ unit_ceph_qty() }} -{% endif %} -{% endif %} - #admin-role: {{ os.admin.role }} - #keystone-admin-role: {{ os.admin.role }} -{% if os.beta.public_api %} - #use-internal-endpoints: true -{% endif %} diff --git a/ci/config_tpl/juju2/bundle_tpl/relations.yaml b/ci/config_tpl/juju2/bundle_tpl/relations.yaml index 012d696d..525204e7 100644 --- a/ci/config_tpl/juju2/bundle_tpl/relations.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/relations.yaml @@ -1,19 +1,30 @@ - [ 'nova-compute:amqp', 'rabbitmq-server:amqp' ] +{% if os.network.controller != 'ocl' %} - [ 'neutron-gateway:amqp', 'rabbitmq-server:amqp' ] + - [ 'neutron-gateway:neutron-plugin-api', 'neutron-api:neutron-plugin-api' ] + - [ 'nova-cloud-controller:quantum-network-service', 'neutron-gateway:quantum-network-service' ] + - [ 'heat:shared-db', 'mysql:shared-db' ] + - [ 'heat:identity-service', 'keystone:identity-service' ] + - [ 'heat:amqp', 'rabbitmq-server:amqp' ] + - [ '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' ] +{% endif %} - [ '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-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' ] - [ 'openstack-dashboard:identity-service', 'keystone:identity-service' ] - [ 'nova-cloud-controller:shared-db', 'mysql:shared-db' ] - [ 'nova-cloud-controller:neutron-api', 'neutron-api:neutron-api' ] @@ -44,15 +55,6 @@ - [ 'congress:amqp', 'rabbitmq-server:amqp' ] {% endif %} {% endif %} - - [ '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' ] - [ 'aodh:amqp', 'rabbitmq-server:amqp' ] - [ 'aodh:shared-db', 'mysql:shared-db' ] - [ 'aodh:identity-service', 'keystone:identity-service' ] @@ -76,35 +78,14 @@ - [ 'openvswitch-onos:ovsdb-manager', 'onos-controller:ovsdb-manager' ] - [ 'neutron-api-onos:onos-controller', 'onos-controller:controller-api' ] {% elif os.network.controller == 'ocl' %} - - [ 'kafka', 'zookeeper' ] - - [ 'contrail-configuration:cassandra', 'cassandra:database' ] - - [ 'contrail-configuration:contrail-analytics-api', 'contrail-analytics:contrail-analytics-api' ] - - [ 'contrail-configuration', 'zookeeper' ] - - [ 'contrail-configuration', 'rabbitmq-server' ] - - [ 'contrail-configuration', 'keystone' ] - - [ 'contrail-configuration', 'haproxy' ] - - [ 'contrail-analytics:cassandra', 'cassandra:database' ] - - [ 'contrail-analytics:contrail-api', 'contrail-configuration:contrail-api' ] - - [ 'contrail-analytics:contrail-discovery', 'contrail-configuration:contrail-discovery' ] - - [ 'contrail-analytics', 'kafka' ] - - [ 'contrail-analytics', 'zookeeper' ] - - [ 'contrail-analytics', 'keystone' ] - - [ 'contrail-analytics', 'haproxy' ] - - [ 'contrail-control:contrail-discovery', 'contrail-configuration:contrail-discovery' ] - - [ 'contrail-control:contrail-ifmap', 'contrail-configuration:contrail-ifmap' ] - - [ 'contrail-control:contrail-api', 'contrail-configuration:contrail-api' ] - - [ 'contrail-control', 'keystone' ] - - [ 'neutron-api-contrail', 'contrail-configuration' ] - - [ 'neutron-api-contrail', 'keystone' ] - - [ 'contrail-webui', 'keystone' ] - - [ 'contrail-webui:contrail_api', 'contrail-configuration:contrail-api' ] - - [ 'contrail-webui:contrail_discovery', 'contrail-configuration:contrail-discovery' ] - - [ 'contrail-webui:cassandra', 'cassandra:database' ] - - [ 'contrail-webui', 'haproxy' ] - - [ 'neutron-contrail', 'keystone' ] - - [ 'neutron-contrail:contrail-discovery', 'contrail-configuration:contrail-discovery' ] - - [ 'neutron-contrail:contrail-api', 'contrail-configuration:contrail-api' ] - - [ 'haproxy', 'keepalived' ] - - [ 'ceilometer', 'ceilometer-contrail' ] - - [ 'ceilometer-contrail', 'contrail-analytics' ] + - [ 'contrail-keystone-auth', 'keystone' ] + - [ 'contrail-controller', 'contrail-keystone-auth' ] + - [ 'contrail-analytics', 'contrail-analyticsdb' ] + - [ 'contrail-controller', 'contrail-analytics' ] + - [ 'contrail-controller', 'contrail-analyticsdb' ] + - [ 'contrail-openstack', 'nova-compute' ] + - [ 'contrail-openstack', 'neutron-api' ] + - [ 'contrail-openstack', 'contrail-controller' ] + - [ 'contrail-agent:juju-info', 'nova-compute:juju-info' ] + - [ 'contrail-agent', 'contrail-controller'] {% endif %} diff --git a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml index c9378d91..b12f0a56 100644 --- a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml @@ -1,4 +1,5 @@ +{% if os.network.controller != 'ocl' %} ceilometer-agent: charm: ./{{ ubuntu.release }}/ceilometer-agent options: @@ -6,6 +7,7 @@ {% if os.beta.public_api %} use-internal-endpoints: true {% endif %} +{% endif %} {% if opnfv.storage_dict.ceph is defined %} cinder-ceph: charm: ./{{ ubuntu.release }}/cinder-ceph @@ -48,26 +50,6 @@ {% if os.network.sfc %} profile: onos-sfc {% endif %} -{% elif os.network.controller == 'ocl' %} - ceilometer-contrail: - charm: ./{{ ubuntu.release }}/ceilometer-contrail - options: - install-sources: ppa:opencontrail/trunk-20160812 - neutron-api-contrail: - charm: ./{{ ubuntu.release }}/neutron-api-contrail - options: - install-sources: ppa:opencontrail/trunk-20160812 - neutron-contrail: - charm: ./{{ ubuntu.release }}/neutron-contrail - options: - install-sources: ppa:opencontrail/trunk-20160812 - keepalived: - charm: ./{{ ubuntu.release }}/keepalived - options: - router-id: 1 -{% if os.ha.mode == 'ha' %} - virtual-ip: {{ opnfv.vip.keepalived }} -{% endif %} {% endif %} {% if os.lxd %} lxd: diff --git a/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml b/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml index 400dcb45..96a27cfb 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/bundle.yaml @@ -15,11 +15,16 @@ {% include 'kubernetes.yaml' %} {% include 'easyrsa.yaml' %} {% include 'etcd.yaml' %} -{% include 'subordinate.yaml' %} {% if k8.feature.loadbalancer %} {% include 'kubeapi-load-balancer.yaml' %} {% endif %} +{% if k8.network.controller == 'ovn' %} +{% include 'ovn.yaml' %} +{% else %} +{% include 'flannel.yaml' %} +{% endif %} + relations: - [ 'ntp:juju-info', 'nodes:juju-info' ] diff --git a/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml b/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml index a4633fcb..ea46e424 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/easyrsa.yaml @@ -6,5 +6,9 @@ "": internal-api {% endif %} to: - - "lxd:nodes/0" +{% if k8.network.controller == 'ovn' %} + - "nodes/1" +{% else %} + - "lxd:nodes/0" +{% endif %} diff --git a/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml b/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml index 5915038c..d902adf8 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/etcd.yaml @@ -1,7 +1,11 @@ etcd: charm: "cs:~containers/etcd" {% if k8.feature.loadbalancer %} +{% if k8.network.controller == 'ovn' %} + num_units: 1 +{% else %} num_units: 3 +{% endif %} {% else %} num_units: 1 {% endif %} @@ -10,6 +14,9 @@ "": internal-api {% endif %} to: +{% if k8.network.controller == 'ovn' %} + - "nodes/0" +{% else %} {% if k8.feature.loadbalancer %} {% for unit_id in to_select() %} - "lxd:nodes/0" @@ -17,4 +24,5 @@ {% else %} - "lxd:nodes/0" {% endif %} +{% endif %} diff --git a/ci/config_tpl/juju2/bundlek8_tpl/flannel.yaml b/ci/config_tpl/juju2/bundlek8_tpl/flannel.yaml new file mode 100644 index 00000000..561e0880 --- /dev/null +++ b/ci/config_tpl/juju2/bundlek8_tpl/flannel.yaml @@ -0,0 +1,7 @@ + + flannel: + charm: cs:~containers/flannel +{% if os.service.bindings %} + bindings: + "": internal-api +{% endif %}
\ No newline at end of file diff --git a/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml b/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml index 93f8890e..933c1ef7 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/kubernetes.yaml @@ -2,13 +2,33 @@ charm: "cs:~containers/kubernetes-master" num_units: 1 expose: true +{% if os.service.bindings %} + bindings: + "": internal-api +{% endif %} +{% if k8.network.controller == 'ovn' %} + options: + channel: 1.5/stable + service-cidr: "192.168.200.0/24" +{% endif %} to: - "nodes/0" + + + kubernetes-worker: charm: "cs:~containers/kubernetes-worker" num_units: {{ opnfv.units - 1 }} expose: true +{% if os.service.bindings %} + bindings: + "": internal-api +{% endif %} +{% if k8.network.controller == 'ovn' %} + options: + channel: 1.5/stable +{% endif %} to: {% for unit_id in range(1, opnfv.units) %} - "nodes/{{ unit_id }}" diff --git a/ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml b/ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml new file mode 100644 index 00000000..978c07c9 --- /dev/null +++ b/ci/config_tpl/juju2/bundlek8_tpl/ovn.yaml @@ -0,0 +1,9 @@ + + ovn: + charm: "cs:~aakashkt/ovn-15" +{% if os.service.bindings %} + bindings: + "": internal-api +{% endif %} + options: + gateway-physical-interface: "none"
\ No newline at end of file diff --git a/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml b/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml index 3a34aa1e..44018201 100644 --- a/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml +++ b/ci/config_tpl/juju2/bundlek8_tpl/relations.yaml @@ -7,9 +7,14 @@ - [ 'kubernetes-master:etcd', 'etcd:db' ] - [ 'kubernetes-master:kube-control', 'kubernetes-worker:kube-control' ] - [ 'kubernetes-worker:certificates', 'easyrsa:client' ] +{% if k8.network.controller == 'ovn' %} + - [ 'ovn:cni', 'kubernetes-master:cni' ] + - [ 'ovn:cni', 'kubernetes-worker:cni' ] +{% else %} - [ 'flannel:etcd', 'etcd:db' ] - [ 'flannel:cni', 'kubernetes-master:cni' ] - [ 'flannel:cni', 'kubernetes-worker:cni' ] +{% endif %} - [ 'etcd:certificates', 'easyrsa:client' ] {% if k8.feature.loadbalancer %} - [ 'kubernetes-master:loadbalancer', 'kubeapi-load-balancer:loadbalancer' ] diff --git a/ci/config_tpl/juju2/bundlek8_tpl/subordinate.yaml b/ci/config_tpl/juju2/bundlek8_tpl/subordinate.yaml deleted file mode 100644 index 30832c54..00000000 --- a/ci/config_tpl/juju2/bundlek8_tpl/subordinate.yaml +++ /dev/null @@ -1,4 +0,0 @@ - - flannel: - charm: cs:~containers/flannel - diff --git a/ci/config_tpl/juju2/deployconfig.yaml b/ci/config_tpl/juju2/deployconfig.yaml index 844ede6f..bc2e1277 100644 --- a/ci/config_tpl/juju2/deployconfig.yaml +++ b/ci/config_tpl/juju2/deployconfig.yaml @@ -15,12 +15,14 @@ opnfv: {% set netdata_prefix = opnfv.spaces_dict.data.cidr[:-4] %} dataNetwork: {{ opnfv.spaces_dict.data.cidr }} {% endif %} +{% if lab.racks[0].osdomainname is defined %} domain: {{ lab.racks[0].osdomainname }} + os-domain-name: {{ lab.racks[0].osdomainname }} +{% endif %} ext-port: {{ lab.racks[0]['ext-port'] }} ext_port: {{ lab.racks[0]['ext-port'] }} floating-ip-range: {{ lab.racks[0]['floating-ip-range'] }} interface-enable: {{ lab.racks[0].ifnamelist }} - os-domain-name: {{ lab.racks[0].osdomainname }} {% if opnfv.spaces_dict.public is defined %} {% set netpublic_prefix = opnfv.spaces_dict.public.cidr[:-4] %} publicNetwork: {{ opnfv.spaces_dict.public.cidr }} |