From: Stuart Mackie Date: Wed, 25 Apr 2018 21:59:06 +0000 (-0400) Subject: Changed charm version, removed unnecessary Contrail patching, added conditionals... X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ff57b174656b762b465d745d5f462484409e147b;p=joid.git Changed charm version, removed unnecessary Contrail patching, added conditionals around ceilometer since not installing yet Change-Id: I49d96ae4be87925053fe37968527a7918f951b30 Signed-off-by: Stuart Mackie --- diff --git a/ci/deploy.sh b/ci/deploy.sh index 30eda410..3078ac28 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -320,18 +320,6 @@ python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, i # Configuring deployment if ([ $opnfvmodel == "openstack" ]); then - if ([ $opnfvsdn == "ocl" ]); then - echo_info "Patching OpenContrail controller container" - juju run --application contrail-controller sudo docker cp contrail-controller:/etc/contrail/vnc_api_lib.ini /tmp - juju run --application contrail-controller cp /tmp/vnc_api_lib.ini /tmp/vnc_api_lib.ini2 - juju run --application contrail-controller 'echo "AUTHN_DOMAIN = admin_domain" >> /tmp/vnc_api_lib.ini2' - juju run --application contrail-controller sudo docker cp /tmp/vnc_api_lib.ini2 contrail-controller:/etc/contrail/vnc_api_lib.ini - juju run --application contrail-controller sudo docker exec contrail-controller service contrail-api restart - - juju run --application contrail-controller sudo docker cp /tmp/vnc_api_lib.ini2 contrail-analytics:/etc/contrail/vnc_api_lib.ini - echo_info "Wait for OpenContrail components to stabilize" - sleep 600 - fi echo_info "Configuring OpenStack deployment" @@ -340,16 +328,22 @@ if ([ $opnfvmodel == "openstack" ]); then # creating heat domain after pushing the public API into /etc/hosts status=`juju run-action heat/0 domain-setup` echo $status - status=`juju run-action ceilometer/0 ceilometer-upgrade` + if ([ $opnfvsdn != "ocl" ]) then + status=`juju run-action ceilometer/0 ceilometer-upgrade` + fi echo $status if ([ $opnftype == "ha" ]); then status=`juju run-action heat/1 domain-setup` echo $status - status=`juju run-action ceilometer/1 ceilometer-upgrade` + if ([ $opnfvsdn != "ocl" ]) then + status=`juju run-action ceilometer/1 ceilometer-upgrade` + fi echo $status status=`juju run-action heat/2 domain-setup` echo $status - status=`juju run-action ceilometer/2 ceilometer-upgrade` + if ([ $opnfvsdn != "ocl" ]) then + status=`juju run-action ceilometer/2 ceilometer-upgrade` + fi echo $status fi diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh index 62fbbd6b..03b67eed 100755 --- a/ci/opencontrail/fetch-charms.sh +++ b/ci/opencontrail/fetch-charms.sh @@ -12,28 +12,30 @@ function build { # openstack bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise -git clone -b stable/17.08 https://github.com/openstack/charm-hacluster.git $distro/hacluster -git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer -git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent -git clone -b stable/17.08 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon -git clone -b stable/17.08 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd -git clone -b stable/17.08 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw -git clone -b stable/17.08 https://github.com/openstack/charm-cinder.git $distro/cinder -git clone -b stable/17.08 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph -git clone -b stable/17.08 https://github.com/openstack/charm-glance.git $distro/glance -git clone -b stable/17.08 https://github.com/openstack/charm-keystone.git $distro/keystone -git clone -b stable/17.08 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster -git clone -b stable/17.08 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api -git clone -b stable/17.08 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway -git clone -b stable/17.08 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch -git clone -b stable/17.08 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller -git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute -git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard -git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server -git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat -git clone -b stable/17.08 https://github.com/openstack/charm-lxd.git $distro/lxd +git clone -b stable/18.02 https://github.com/openstack/charm-hacluster.git $distro/hacluster +git clone -b stable/18.02 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer +git clone -b stable/18.02 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent +git clone -b stable/18.02 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon +git clone -b stable/18.02 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd +git clone -b stable/18.02 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw +git clone -b stable/18.02 https://github.com/openstack/charm-cinder.git $distro/cinder +git clone -b stable/18.02 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph +git clone -b stable/18.02 https://github.com/openstack/charm-glance.git $distro/glance +git clone -b stable/18.02 https://github.com/openstack/charm-keystone.git $distro/keystone +git clone -b stable/18.02 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/18.02 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api +git clone -b stable/18.02 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway +git clone -b stable/18.02 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch +git clone -b stable/18.02 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller +git clone -b stable/18.02 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute +git clone -b stable/18.02 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard +git clone -b stable/18.02 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server +git clone -b stable/18.02 https://github.com/openstack/charm-heat.git $distro/heat +git clone -b stable/18.02 https://github.com/openstack/charm-lxd.git $distro/lxd git clone https://github.com/openbaton/juju-charm.git $distro/openbaton +charm pull cs:memcached $distro/memcached +charm pull cs:gnocchi $distro/gnocchi charm pull cs:$distro/mongodb $distro/mongodb charm pull cs:ntp $distro/ntp charm pull cs:$distro/aodh $distro/aodh