Merge pull request openshift#10547 from mjudeikis/osa.rollback.azure.cli

OSA - rollback azure cli version
kriscui · Oct 30, 2018 · 42da4ce · 42da4ce
2 parents 407282a + 09eac92
commit 42da4ce
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/images/installer/Dockerfile b/images/installer/Dockerfile
@@ -10,7 +10,7 @@ COPY images/installer/origin-extra-root /
 # install ansible and deps
 RUN INSTALL_PKGS="python-lxml python-dns pyOpenSSL python2-cryptography openssl python2-passlib httpd-tools openssh-clients origin-clients iproute patch" \
  && yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS \
- && EPEL_PKGS="ansible-2.6.5 python2-boto python2-boto3 python2-crypto which python2-pip.noarch python2-scandir python2-packaging azure-cli-2.0.47" \
+ && EPEL_PKGS="ansible-2.6.5 python2-boto python2-boto3 python2-crypto which python2-pip.noarch python2-scandir python2-packaging azure-cli-2.0.46" \
  && yum install -y epel-release \
  && yum install -y --setopt=tsflags=nodocs $EPEL_PKGS \
  && if [ "$(uname -m)" == "x86_64" ]; then yum install -y https://sdodson.fedorapeople.org/google-cloud-sdk-183.0.0-3.el7.x86_64.rpm ; fi \

diff --git a/images/installer/Dockerfile.ci b/images/installer/Dockerfile.ci
@@ -27,7 +27,7 @@ COPY images/installer/origin-extra-root /
 RUN yum install -y epel-release && \
     rm -rf /etc/yum.repos.d/centos-openshift-origin.repo && \
     yum-config-manager --enable built > /dev/null && \
-    INSTALL_PKGS="openssh google-cloud-sdk azure-cli-2.0.47" \
+    INSTALL_PKGS="openssh google-cloud-sdk azure-cli-2.0.46" \
     yum install --setopt=tsflags=nodocs -y $INSTALL_PKGS openshift-ansible-test && \
     yum clean all
 

diff --git a/playbooks/azure/openshift-cluster/tasks/create_blob_from_vm.yml b/playbooks/azure/openshift-cluster/tasks/create_blob_from_vm.yml
@@ -23,7 +23,7 @@
 - name: start copy
   command: >
     az storage blob copy start
-    --source-uri "{{ (sas.stdout | from_json).accessSas }}"
+    --source-uri "{{ (sas.stdout | from_json).properties.output.accessSAS }}"
     --account-name "{{ openshift_azure_storage_account }}"
     --account-key "{{ (keys.stdout | from_json)[0].value }}"
     --destination-container "{{ openshift_azure_container }}"