From c21e199a328c1d52232c213d2b243016cca46812 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Mon, 1 May 2017 14:32:51 -0500 Subject: added support for install from git repository. please modify default_deployment_config.yaml to install from release repo for ocata,master etc. Also user can define their own URL and more information can be obtained at jujucharms.com Change-Id: I4943dbf68c6d980b2a2da65417b16631df768b48 Signed-off-by: Narinder Gupta --- ci/config_tpl/juju2/bundle_tpl/cinder.yaml | 3 +++ ci/config_tpl/juju2/bundle_tpl/glance.yaml | 3 +++ ci/config_tpl/juju2/bundle_tpl/keystone.yaml | 5 ++++- ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml | 3 +++ ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml | 3 +++ ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml | 3 +++ ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml | 3 +++ ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml | 3 +++ ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml | 3 +++ 9 files changed, 28 insertions(+), 1 deletion(-) (limited to 'ci/config_tpl/juju2') diff --git a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml index 8b26e25e..cce12e01 100644 --- a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml @@ -18,6 +18,9 @@ {% endif %} options: openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" +{% if os.git_repo.origin_git %} + openstack-origin-git: "{{ os.git_repo.branch }}" +{% endif %} region: {{ os.region }} block-device: None glance-api-version: 2 diff --git a/ci/config_tpl/juju2/bundle_tpl/glance.yaml b/ci/config_tpl/juju2/bundle_tpl/glance.yaml index 3329ea40..be80bb39 100644 --- a/ci/config_tpl/juju2/bundle_tpl/glance.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/glance.yaml @@ -14,6 +14,9 @@ {% endif %} options: openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" +{% if os.git_repo.origin_git %} + openstack-origin-git: "{{ os.git_repo.branch }}" +{% endif %} region: {{ os.region }} {% if os.beta.public_api %} use-internal-endpoints: true diff --git a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml index 4f81dc5f..0d21f649 100644 --- a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml @@ -14,10 +14,13 @@ {% endif %} options: openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" +{% if os.git_repo.origin_git %} + openstack-origin-git: "{{ os.git_repo.branch }}" +{% endif %} region: {{ os.region }} admin-role: {{ os.admin.role }} keystone-admin-role: {{ os.admin.role }} - preferred-api-version: 2 + preferred-api-version: 3 {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml index 0febddd1..620cc02e 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml @@ -14,6 +14,9 @@ {% endif %} options: openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" +{% if os.git_repo.origin_git %} + openstack-origin-git: "{{ os.git_repo.branch }}" +{% endif %} region: {{ os.region }} neutron-security-groups: true {% if os.beta.public_api %} diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml index f0416a73..d1159bb5 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml @@ -12,6 +12,9 @@ {% endif %} options: openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" +{% if os.git_repo.origin_git %} + openstack-origin-git: "{{ os.git_repo.branch }}" +{% endif %} {% if os.api.worker_multiplier %} worker-multiplier: {{ os.api.worker_multiplier }} {% endif %} diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml index 1dd2210d..65ecdd73 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml @@ -12,6 +12,9 @@ {% endif %} {% else %} options: +{% if os.git_repo.origin_git %} + openstack-origin-git: "{{ os.git_repo.branch }}" +{% endif %} {% if opnfv.spaces_dict.data is defined %} os-data-network: {{ opnfv.spaces_dict.data.cidr }} {% endif %} diff --git a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml index b5fdb103..8373b2bb 100644 --- a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml @@ -14,6 +14,9 @@ {% endif %} options: openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" +{% if os.git_repo.origin_git %} + openstack-origin-git: "{{ os.git_repo.branch }}" +{% endif %} region: {{ os.region }} console-access-protocol: novnc neutron-external-network: ext-net diff --git a/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml b/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml index 29a5f405..66d53852 100644 --- a/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml @@ -11,6 +11,9 @@ {% endif %} options: openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" +{% if os.git_repo.origin_git %} + openstack-origin-git: "{{ os.git_repo.branch }}" +{% endif %} enable-live-migration: true enable-resize: true migration-auth-type: ssh diff --git a/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml index bf0ac99d..cba9b794 100644 --- a/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml @@ -15,6 +15,9 @@ {% endif %} options: openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" +{% if os.git_repo.origin_git %} + openstack-origin-git: "{{ os.git_repo.branch }}" +{% endif %} secret: admin webroot: / {% if os.network.ipv6 %} -- cgit 1.2.3-korg