diff options
| -rwxr-xr-x | ci/opencontrail/fetch-charms.sh | 40 | ||||
| -rwxr-xr-x | ci/openstack.sh | 2 | ||||
| -rw-r--r-- | docs/release/release-notes/release-notes.rst | 9 | ||||
| -rw-r--r-- | docs/release/userguide/userguide.rst | 4 |
4 files changed, 28 insertions, 27 deletions
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh index ef967c56..62fbbd6b 100755 --- a/ci/opencontrail/fetch-charms.sh +++ b/ci/opencontrail/fetch-charms.sh @@ -12,26 +12,26 @@ function build { # openstack bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise -git clone -b stable/17.11 https://github.com/openstack/charm-hacluster.git $distro/hacluster -git clone -b stable/17.11 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer -git clone -b stable/17.11 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent -git clone -b stable/17.11 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon -git clone -b stable/17.11 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd -git clone -b stable/17.11 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw -git clone -b stable/17.11 https://github.com/openstack/charm-cinder.git $distro/cinder -git clone -b stable/17.11 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph -git clone -b stable/17.11 https://github.com/openstack/charm-glance.git $distro/glance -git clone -b stable/17.11 https://github.com/openstack/charm-keystone.git $distro/keystone -git clone -b stable/17.11 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster -git clone -b stable/17.11 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api -git clone -b stable/17.11 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway -git clone -b stable/17.11 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch -git clone -b stable/17.11 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller -git clone -b stable/17.11 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute -git clone -b stable/17.11 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard -git clone -b stable/17.11 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server -git clone -b stable/17.11 https://github.com/openstack/charm-heat.git $distro/heat -git clone -b stable/17.11 https://github.com/openstack/charm-lxd.git $distro/lxd +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 https://github.com/openbaton/juju-charm.git $distro/openbaton charm pull cs:$distro/mongodb $distro/mongodb diff --git a/ci/openstack.sh b/ci/openstack.sh index b35f28c1..3c8f9757 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -72,7 +72,7 @@ create_openrc() { mkdir -m 0700 -p cloud keystoneIp=$(keystoneIp) - adminPasswd=$(juju config keystone | grep admin-password -A 5 | grep value | awk '{print $2}' 2> /dev/null) + adminPasswd=$(juju config keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['admin-password']['value']" | cut -d " " -f 1) v3api=`juju config keystone preferred-api-version` diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst index 8a58e612..042dd0ee 100644 --- a/docs/release/release-notes/release-notes.rst +++ b/docs/release/release-notes/release-notes.rst @@ -59,7 +59,7 @@ Release Data | **Release designation** | Euphrates release | | | | +--------------------------------------+--------------------------------------+ -| **Release date** | October 24 2017 | +| **Release date** | December 15 2017 | | | | +--------------------------------------+--------------------------------------+ | **Purpose of the delivery** | Euphrates release | @@ -88,7 +88,7 @@ Module version change ~~~~~~~~~~~~~~~~~~~~~ - Euphrates release with the JOID deployment toolchain. - OpenStack (Ocata release) - - Kubernetes 1.7 + - Kubernetes 1.8 - Ubuntu 16.04 LTS Document version change @@ -132,8 +132,9 @@ Bug corrections | **JIRA REFERENCE** | **SLOGAN** | | | | +--------------------------------------+--------------------------------------+ -| JIRA: | | -| | | +| JIRA: | Fixes the issue on get the keyston IP| ++--------------------------------------+--------------------------------------+ +| JIRA: | Fix provided where use Public API | +--------------------------------------+--------------------------------------+ diff --git a/docs/release/userguide/userguide.rst b/docs/release/userguide/userguide.rst index 04bceed8..63911a0e 100644 --- a/docs/release/userguide/userguide.rst +++ b/docs/release/userguide/userguide.rst @@ -510,9 +510,9 @@ The function configOpenrc() creates the OpenStack login credentials, the functio create_openrc() { keystoneIp=$(keystoneIp) if [[ "$jujuver" < "2" ]]; then - adminPasswd=$(juju get keystone | grep admin-password -A 5 | grep value | awk '{print $2}' 2> /dev/null) + adminPasswd=$(juju get keystone | grep admin-password -A 7 | grep value | awk '{print $2}' 2> /dev/null) else - adminPasswd=$(juju config keystone | grep admin-password -A 5 | grep value | awk '{print $2}' 2> /dev/null) + adminPasswd=$(juju config keystone | grep admin-password -A 7 | grep value | awk '{print $2}' 2> /dev/null) fi configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v2.0 RegionOne > ~/joid_config/admin-openrc |